diff mbox series

ALSA: pcm_dmaengine: Don't synchronize DMA channel when DMA is paused

Message ID 1721198693-27636-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive)
State Accepted
Commit 88e98af9f4b5b0d60c1fe7f7f2701b5467691e75
Headers show
Series ALSA: pcm_dmaengine: Don't synchronize DMA channel when DMA is paused | expand

Commit Message

Shengjiu Wang July 17, 2024, 6:44 a.m. UTC
When suspended, the DMA channel may enter PAUSE state if dmaengine_pause()
is supported by DMA.
At this state, dmaengine_synchronize() should not be called, otherwise
the DMA channel can't be resumed successfully.

Fixes: e8343410ddf0 ("ALSA: dmaengine: Synchronize dma channel after drop()")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 sound/core/pcm_dmaengine.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Takashi Iwai July 17, 2024, 8:40 a.m. UTC | #1
On Wed, 17 Jul 2024 08:44:53 +0200,
Shengjiu Wang wrote:
> 
> When suspended, the DMA channel may enter PAUSE state if dmaengine_pause()
> is supported by DMA.
> At this state, dmaengine_synchronize() should not be called, otherwise
> the DMA channel can't be resumed successfully.
> 
> Fixes: e8343410ddf0 ("ALSA: dmaengine: Synchronize dma channel after drop()")
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>

Thanks, applied now.


Takashi
diff mbox series

Patch

diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c
index b54336d4bffc..b134a51b3fd5 100644
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@ -352,8 +352,12 @@  EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
 int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
 {
 	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+	struct dma_tx_state state;
+	enum dma_status status;
 
-	dmaengine_synchronize(prtd->dma_chan);
+	status = dmaengine_tx_status(prtd->dma_chan, prtd->cookie, &state);
+	if (status != DMA_PAUSED)
+		dmaengine_synchronize(prtd->dma_chan);
 
 	return 0;
 }