Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 932a5808 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Sasha Levin
Browse files

ASoC: q6asm: handle EOS correctly 



[ Upstream commit 6476b60f32866be49d05e2e0163f337374c55b06 ]

Successful send of EOS command does not indicate that EOS is actually
finished, correct event to wait EOS is finished is EOS_RENDERED event.
EOS_RENDERED means that the DSP has finished processing all the buffers
for that particular session and stream.

This patch fixes EOS handling!

Fixes: 68fd8480 ("ASoC: qdsp6: q6asm: Add support to audio stream apis")
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200611124159.20742-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 855150a7

sound/soc/qcom/qdsp6/q6asm.c

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define ASM_STREAM_CMD_FLUSH			0x00010BCE

#define ASM_SESSION_CMD_PAUSE			0x00010BD3

#define ASM_DATA_CMD_EOS			0x00010BDB

#define ASM_DATA_EVENT_RENDERED_EOS		0x00010C1C

#define ASM_NULL_POPP_TOPOLOGY			0x00010C68

#define ASM_STREAM_CMD_FLUSH_READBUFS		0x00010C09

#define ASM_STREAM_CMD_SET_ENCDEC_PARAM		0x00010C10
@@ -545,9 +546,6 @@ static int32_t q6asm_stream_callback(struct apr_device *adev, 
		case ASM_SESSION_CMD_SUSPEND:

			client_event = ASM_CLIENT_EVENT_CMD_SUSPEND_DONE;

			break;

		case ASM_DATA_CMD_EOS:

			client_event = ASM_CLIENT_EVENT_CMD_EOS_DONE;

			break;

		case ASM_STREAM_CMD_FLUSH:

			client_event = ASM_CLIENT_EVENT_CMD_FLUSH_DONE;

			break;
@@ -650,6 +648,9 @@ static int32_t q6asm_stream_callback(struct apr_device *adev, 
			spin_unlock_irqrestore(&ac->lock, flags);

		}



		break;

	case ASM_DATA_EVENT_RENDERED_EOS:

		client_event = ASM_CLIENT_EVENT_CMD_EOS_DONE;

		break;

	}