ASoC: qcom: q6asm-dai: use q6asm_get_hw_pointer

make use of q6asm_get_hw_pointer to get the current hardware read/write
pointer and remove any additional code that does calculate this manually.
As this is redundant and prone to errors.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Tested-by: Alexey Klimov <alexey.klimov@linaro.org> # RB5, RB3
Link: https://patch.msgid.link/20251023102444.88158-9-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index db2ea8973ac98626a7763ec45ff95f8aea364c02..c2a33d6a0827146e46777d5ae9c4c6f588550711 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -58,7 +58,6 @@ struct q6asm_dai_rtd {
        phys_addr_t phys;
        unsigned int pcm_size;
        unsigned int pcm_count;
-       unsigned int pcm_irq_pos;       /* IRQ position */
        unsigned int periods;
        uint64_t bytes_sent;
        uint64_t bytes_received;
@@ -190,12 +189,10 @@ static void event_handler(uint32_t opcode, uint32_t token,
                prtd->state = Q6ASM_STREAM_STOPPED;
                break;
        case ASM_CLIENT_EVENT_DATA_WRITE_DONE: {
-               prtd->pcm_irq_pos += prtd->pcm_count;
                snd_pcm_period_elapsed(substream);
                break;
                }
        case ASM_CLIENT_EVENT_DATA_READ_DONE:
-               prtd->pcm_irq_pos += prtd->pcm_count;
                snd_pcm_period_elapsed(substream);
                if (prtd->state == Q6ASM_STREAM_RUNNING)
                        q6asm_read(prtd->audio_client, prtd->stream_id);
@@ -227,7 +224,6 @@ static int q6asm_dai_prepare(struct snd_soc_component *component,
        }
 
        prtd->pcm_count = snd_pcm_lib_period_bytes(substream);
-       prtd->pcm_irq_pos = 0;
        /* rate and channels are sent to audio driver */
        if (prtd->state == Q6ASM_STREAM_RUNNING) {
                /* clear the previous setup if any  */
@@ -479,11 +475,13 @@ static snd_pcm_uframes_t q6asm_dai_pointer(struct snd_soc_component *component,
 
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct q6asm_dai_rtd *prtd = runtime->private_data;
+       snd_pcm_uframes_t ptr;
 
-       if (prtd->pcm_irq_pos >= prtd->pcm_size)
-               prtd->pcm_irq_pos = 0;
+       ptr = q6asm_get_hw_pointer(prtd->audio_client, substream->stream) * runtime->period_size;
+       if (ptr)
+               return ptr - 1;
 
-       return bytes_to_frames(runtime, (prtd->pcm_irq_pos));
+       return 0;
 }
 
 static int q6asm_dai_hw_params(struct snd_soc_component *component,