Unverified Commit e0c078a8 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: q6asm: use flags directly from q6asm-dai 



use flags set by q6asm-dais directly!

This will be useful gapless case where write needs a special flag to indicate
that last buffer.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarVinod Koul <vkoul@kernel.org>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200727093806.17089-4-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 789e3b6c

sound/soc/qcom/qdsp6/q6asm-dai.c

+4 −4
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void event_handler(uint32_t opcode, uint32_t token, 
	case ASM_CLIENT_EVENT_CMD_RUN_DONE:

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)

			q6asm_write_async(prtd->audio_client, prtd->stream_id,

				   prtd->pcm_count, 0, 0, NO_TIMESTAMP);

				   prtd->pcm_count, 0, 0, 0);

		break;

	case ASM_CLIENT_EVENT_CMD_EOS_DONE:

		prtd->state = Q6ASM_STREAM_STOPPED;
@@ -193,7 +193,7 @@ static void event_handler(uint32_t opcode, uint32_t token, 
		snd_pcm_period_elapsed(substream);

		if (prtd->state == Q6ASM_STREAM_RUNNING)

			q6asm_write_async(prtd->audio_client, prtd->stream_id,

					   prtd->pcm_count, 0, 0, NO_TIMESTAMP);

					   prtd->pcm_count, 0, 0, 0);



		break;

		}
@@ -512,7 +512,7 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 
		spin_lock_irqsave(&prtd->lock, flags);

		if (!prtd->bytes_sent) {

			q6asm_write_async(prtd->audio_client, prtd->stream_id,

					  prtd->pcm_count, 0, 0, NO_TIMESTAMP);

					  prtd->pcm_count, 0, 0, 0);

			prtd->bytes_sent += prtd->pcm_count;

		}
@@ -538,7 +538,7 @@ static void compress_event_handler(uint32_t opcode, uint32_t token, 


		if (avail >= prtd->pcm_count) {

			q6asm_write_async(prtd->audio_client, prtd->stream_id,

					   prtd->pcm_count, 0, 0, NO_TIMESTAMP);

					   prtd->pcm_count, 0, 0, 0);

			prtd->bytes_sent += prtd->pcm_count;

		}

sound/soc/qcom/qdsp6/q6asm.c

+1 −4
Original line number Diff line number Diff line
@@ -1546,10 +1546,7 @@ int q6asm_write_async(struct audio_client *ac, uint32_t stream_id, uint32_t len, 
	write->mem_map_handle =

	    ac->port[SNDRV_PCM_STREAM_PLAYBACK].mem_map_handle;



	if (wflags == NO_TIMESTAMP)

		write->flags = (wflags & 0x800000FF);

	else

		write->flags = (0x80000000 | wflags);

	write->flags = wflags;



	port->dsp_buf++;

sound/soc/qcom/qdsp6/q6asm.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ enum { 
};



#define MAX_SESSIONS	8

#define NO_TIMESTAMP    0xFF00

#define FORMAT_LINEAR_PCM   0x0000



struct q6asm_flac_cfg {

CRA Git | Maintained and supported by SUSTech CRA and CCSE