Unverified Commit 9f7041b7 authored by Ravulapati Vishnu vardhan rao's avatar Ravulapati Vishnu vardhan rao Committed by Mark Brown
Browse files

ASoC: amd: closing specific instance. 



The steps to reproduce:

Record from the internal mic :
(arecord -D hw:1,2 -f dat /dev/null -V stereos)

Record from the headphone mic:
(arecord -D hw:1,0 -f dat /dev/null -V stereos)

Kill the recording from internal mic.
We can see the recording from the headphone mic is broken.

This patch rectifies the issue reported.

Signed-off-by: default avatarRavulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Link: https://lore.kernel.org/r/20200618072653.27103-1-Vishnuvardhanrao.Ravulapati@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dcb231e8

sound/soc/amd/raven/acp3x-pcm-dma.c

+23 −7
Original line number Diff line number Diff line
@@ -342,25 +342,41 @@ static int acp3x_dma_close(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *prtd;

	struct i2s_dev_data *adata;

	struct i2s_stream_instance *ins;



	prtd = substream->private_data;

	component = snd_soc_rtdcom_lookup(prtd, DRV_NAME);

	adata = dev_get_drvdata(component->dev);

	ins = substream->runtime->private_data;

	if (!ins)

		return -EINVAL;





	/* Disable ACP irq, when the current stream is being closed and

	 * another stream is also not active.

	 */

	if (!adata->play_stream && !adata->capture_stream &&

		!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		switch (ins->i2s_instance) {

		case I2S_BT_INSTANCE:

			adata->play_stream = NULL;

			break;

		case I2S_SP_INSTANCE:

		default:

			adata->i2ssp_play_stream = NULL;

		}

	} else {

		switch (ins->i2s_instance) {

		case I2S_BT_INSTANCE:

			adata->capture_stream = NULL;

			break;

		case I2S_SP_INSTANCE:

		default:

			adata->i2ssp_capture_stream = NULL;

		}

	}



	/* Disable ACP irq, when the current stream is being closed and

	 * another stream is also not active.

	 */

	if (!adata->play_stream && !adata->capture_stream &&

		!adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)

		rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE