evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: qdsp6v2: fix spurious wakeup from q6asm cmd_wait"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-31 14:01:05 -08:00 • committed by Gerrit - the friendly Code Review server
commit 477b504fc6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/msm/qdsp6v2/q6asm.c
View file

@ -7361,7 +7361,7 @@ int q6asm_async_write(struct audio_client *ac,
} }
q6asm_stream_add_hdr_async( q6asm_stream_add_hdr_async(
ac, &write.hdr, sizeof(write), FALSE, ac->stream_id); ac, &write.hdr, sizeof(write), TRUE, ac->stream_id);
port = &ac->port[IN]; port = &ac->port[IN];
ab = &port->buf[port->dsp_buf]; ab = &port->buf[port->dsp_buf];
@ -7522,7 +7522,7 @@ int q6asm_write(struct audio_client *ac, uint32_t len, uint32_t msw_ts,
0, /* Stream ID is NA */ 0, /* Stream ID is NA */
port->dsp_buf, port->dsp_buf,
0, /* Direction flag is NA */ 0, /* Direction flag is NA */
WAIT_CMD); NO_WAIT_CMD);
write.hdr.opcode = ASM_DATA_CMD_WRITE_V2; write.hdr.opcode = ASM_DATA_CMD_WRITE_V2;
write.buf_addr_lsw = lower_32_bits(ab->phys); write.buf_addr_lsw = lower_32_bits(ab->phys);
write.buf_addr_msw = msm_audio_populate_upper_32_bits(ab->phys); write.buf_addr_msw = msm_audio_populate_upper_32_bits(ab->phys);
@ -7601,7 +7601,7 @@ int q6asm_write_nolock(struct audio_client *ac, uint32_t len, uint32_t msw_ts,
0, /* Stream ID is NA */ 0, /* Stream ID is NA */
port->dsp_buf, port->dsp_buf,
0, /* Direction flag is NA */ 0, /* Direction flag is NA */
WAIT_CMD); NO_WAIT_CMD);
write.hdr.opcode = ASM_DATA_CMD_WRITE_V2; write.hdr.opcode = ASM_DATA_CMD_WRITE_V2;
write.buf_addr_lsw = lower_32_bits(ab->phys); write.buf_addr_lsw = lower_32_bits(ab->phys);
@ -8049,7 +8049,7 @@ static int __q6asm_cmd_nowait(struct audio_client *ac, int cmd,
stream_id, stream_id,
0, /* Buffer index is NA */ 0, /* Buffer index is NA */
0, /* Direction flag is NA */ 0, /* Direction flag is NA */
WAIT_CMD); NO_WAIT_CMD);
pr_debug("%s: token = 0x%x, stream_id %d, session 0x%x\n", pr_debug("%s: token = 0x%x, stream_id %d, session 0x%x\n",
__func__, hdr.token, stream_id, ac->session); __func__, hdr.token, stream_id, ac->session);
@ -8113,7 +8113,7 @@ int __q6asm_send_meta_data(struct audio_client *ac, uint32_t stream_id,
return -EINVAL; return -EINVAL;
} }
pr_debug("%s: session[%d]\n", __func__, ac->session); pr_debug("%s: session[%d]\n", __func__, ac->session);
q6asm_stream_add_hdr_async(ac, &silence.hdr, sizeof(silence), FALSE, q6asm_stream_add_hdr_async(ac, &silence.hdr, sizeof(silence), TRUE,
stream_id); stream_id);
/* /*
@ -8127,7 +8127,7 @@ int __q6asm_send_meta_data(struct audio_client *ac, uint32_t stream_id,
stream_id, stream_id,
0, /* Buffer index is NA */ 0, /* Buffer index is NA */
0, /* Direction flag is NA */ 0, /* Direction flag is NA */
WAIT_CMD); NO_WAIT_CMD);
pr_debug("%s: token = 0x%x, stream_id %d, session 0x%x\n", pr_debug("%s: token = 0x%x, stream_id %d, session 0x%x\n",
__func__, silence.hdr.token, stream_id, ac->session); __func__, silence.hdr.token, stream_id, ac->session);