Merge "ASoC: msm: qdsp6v2: fix spurious wakeup from q6asm cmd_wait" (477b504f) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/qdsp6v2/q6asm.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -7361,7 +7361,7 @@ int q6asm_async_write(struct audio_client *ac,
		}

		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];
		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 */
		port->dsp_buf,
		0, /* Direction flag is NA */
		WAIT_CMD);
		NO_WAIT_CMD);
		write.hdr.opcode = ASM_DATA_CMD_WRITE_V2;
		write.buf_addr_lsw = lower_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 */
		port->dsp_buf,
		0, /* Direction flag is NA */
		WAIT_CMD);
		NO_WAIT_CMD);

		write.hdr.opcode = ASM_DATA_CMD_WRITE_V2;
		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,
		0, /* Buffer index 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",
		__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;
		}
		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);

		/*
		@@ -8127,7 +8127,7 @@ int __q6asm_send_meta_data(struct audio_client *ac, uint32_t stream_id,
		stream_id,
		0, /* Buffer index 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",
		__func__, silence.hdr.token, stream_id, ac->session);