diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2020-07-27 11:37:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-17 19:29:32 +0200 |
| commit | e0c078a8da333eb45745d1c5e4b72f0314b8b742 (patch) | |
| tree | 5884100e7cbec65e5ad13f8ef8e6414d11bbf705 /sound/soc/qcom | |
| parent | ASoC: q6asm: make commands specific to streams (diff) | |
| download | linux-e0c078a8da333eb45745d1c5e4b72f0314b8b742.tar.xz linux-e0c078a8da333eb45745d1c5e4b72f0314b8b742.zip | |
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: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Vinod Koul <vkoul@kernel.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200727093806.17089-4-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/qcom')
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6asm-dai.c | 8 | ||||
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6asm.c | 5 | ||||
| -rw-r--r-- | sound/soc/qcom/qdsp6/q6asm.h | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index 0f157f118a3f..0df2fde9b2f3 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -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; } diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 97f448bc7972..f7a94cd53c73 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -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++; diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h index ceece124dd3d..9ac020c609c6 100644 --- a/sound/soc/qcom/qdsp6/q6asm.h +++ b/sound/soc/qcom/qdsp6/q6asm.h @@ -29,7 +29,6 @@ enum { }; #define MAX_SESSIONS 8 -#define NO_TIMESTAMP 0xFF00 #define FORMAT_LINEAR_PCM 0x0000 struct q6asm_flac_cfg { |