ASoC: pcm: call snd_soc_dapm_stream_stop() in soc_pcm_hw_clean (a27b421f) · Commits · 戴 / test

Currently, the SND_SOC_DAPM_STREAM_START event is sent during pcm_prepare() but the SND_SOC_DAPM_STREAM_STOP event is sent only in dpcm_fe_dai_shutdown() after soc_pcm_close(). This results in an imbalance between when the DAPM widgets receive the PRE/POST_PMU/PMD events. So call snd_soc_dapm_stream_stop() in soc_pcm_hw_clean() before the snd_soc_pcm_component_hw_free() to keep the stream_stop DAPM event balanced with the stream_start event in soc_pm_prepare(). Also, in order to prevent duplicate DAPM stream events, remove the call for DAPM STREAM_START event in dpcm_fe_dai_prepare() and the call for DAPM STREAM_STOP event in dpcm_fe_dai_shutdown(). Reviewed-by:

Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by:

Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by:

Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://lore.kernel.org/r/20201117215001.163107-1-ranjani.sridharan@linux.intel.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/soc-pcm.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -662,8 +662,6 @@ static int soc_pcm_clean(struct snd_pcm_substream *substream, int rollback)

		soc_pcm_components_close(substream, rollback);

		if (!rollback)
		snd_soc_dapm_stream_stop(rtd, substream->stream);

		mutex_unlock(&rtd->card->pcm_mutex);

		@@ -882,6 +880,9 @@ static int soc_pcm_hw_clean(struct snd_pcm_substream *substream, int rollback)
		snd_soc_dai_digital_mute(dai, 1, substream->stream);
		}

		/* run the stream event */
		snd_soc_dapm_stream_stop(rtd, substream->stream);

		/* free any machine hw params */
		snd_soc_link_hw_free(substream, rollback);

		@@ -1859,9 +1860,6 @@ static int dpcm_fe_dai_shutdown(struct snd_pcm_substream *substream)
		/* now shutdown the frontend */
		soc_pcm_close(substream);

		/* run the stream event for each BE */
		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
		dpcm_set_fe_update_state(fe, stream, SND_SOC_DPCM_UPDATE_NO);
		return 0;
		@@ -2363,8 +2361,6 @@ static int dpcm_fe_dai_prepare(struct snd_pcm_substream *substream)
		goto out;
		}

		/* run the stream event for each BE */
		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);
		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;

		out:

Admin message