]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: qdsp6: q6apm-dai: unprepare stream if its already prepared
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Fri, 10 Jun 2022 14:48:18 +0000 (15:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:45:15 +0000 (11:45 +0200)
commit 6548c884a595391fab172faeae39e2b329b848f3 upstream.

prepare callback can be called multiple times, so unprepare the stream
if its already prepared.

Without this DSP is not happy to setting the params on a already
prepared graph.

Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support")
Reported-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20220610144818.511797-1-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/qcom/qdsp6/q6apm-dai.c

index ee59ef36b85a614916f0a90fdbdc129ac59f0821..e45210c0e25e66e8b6eb045dbb51ba6448a8482a 100644 (file)
@@ -153,6 +153,12 @@ static int q6apm_dai_prepare(struct snd_soc_component *component,
                q6apm_unmap_memory_regions(prtd->graph, substream->stream);
        }
 
+       if (prtd->state) {
+               /* clear the previous setup if any  */
+               q6apm_graph_stop(prtd->graph);
+               q6apm_unmap_memory_regions(prtd->graph, substream->stream);
+       }
+
        prtd->pcm_count = snd_pcm_lib_period_bytes(substream);
        prtd->pos = 0;
        /* rate and channels are sent to audio driver */