Unverified Commit 30896d36 authored by Daniel Kurtz's avatar Daniel Kurtz Committed by Mark Brown
Browse files

ASoC: AMD: Always stop ch2 first 



Commit 6b116dfb ("ASoC: AMD: make channel 1 dma as circular") made
both channels circular, so this comment and logic no longer applies.  Always
stop ch2 (the channel closest to the output) before ch1.  This ensures
that the downstream circular DMA channel does not continue to play/capture
repeated samples after the upstream circular DMA channel has already
stopped.

Signed-off-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e0431de3

sound/soc/amd/acp-pcm-dma.c

+2 −15
Original line number Original line Diff line number Diff line
@@ -1067,21 +1067,8 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) 
	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		/* For playback, non circular dma should be stopped first

		 * i.e Sysram to acp dma transfer channel(rtd->ch1) should be

		 * stopped before stopping cirular dma which is acp sram to i2s

		 * fifo dma transfer channel(rtd->ch2). Where as in Capture

		 * scenario, i2s fifo to acp sram dma channel(rtd->ch2) stopped

		 * first before stopping acp sram to sysram which is circular

		 * dma(rtd->ch1).

		 */

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

			acp_dma_stop(rtd->acp_mmio, rtd->ch1);

			ret =  acp_dma_stop(rtd->acp_mmio, rtd->ch2);

		} else {

		acp_dma_stop(rtd->acp_mmio, rtd->ch2);

		acp_dma_stop(rtd->acp_mmio, rtd->ch2);

		ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1);

		ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1);

		}

		rtd->bytescount = 0;

		rtd->bytescount = 0;

		break;

		break;

	default:

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE