Unverified Commit b73287f0 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: soc-pcm: dpcm: fix playback/capture checks 



Recent changes in the ASoC core prevent multi-cpu BE dailinks from
being used. DPCM does support multi-cpu DAIs for BE Dailinks, but not
for FE.

Handle the FE checks first, and make sure all DAIs support the same
capabilities within the same dailink.

Fixes: 9b5db059 ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@gmail.com>
BugLink: https://github.com/thesofproject/linux/issues/2031
Link: https://lore.kernel.org/r/20200608194415.4663-2-pierre-louis.bossart@linux.intel.com


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

sound/soc/soc-pcm.c

+34 −10
Original line number Diff line number Diff line
@@ -2789,20 +2789,44 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
	struct snd_pcm *pcm;

	char new_name[64];

	int ret = 0, playback = 0, capture = 0;

	int stream;

	int i;



	if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {

		cpu_dai = asoc_rtd_to_cpu(rtd, 0);

		if (rtd->num_cpus > 1) {

	if (rtd->dai_link->dynamic && rtd->num_cpus > 1) {

		dev_err(rtd->dev,

				"DPCM doesn't support Multi CPU yet\n");

			"DPCM doesn't support Multi CPU for Front-Ends yet\n");

		return -EINVAL;

	}



	if (rtd->dai_link->dynamic || rtd->dai_link->no_pcm) {

		if (rtd->dai_link->dpcm_playback) {

			stream = SNDRV_PCM_STREAM_PLAYBACK;



			for_each_rtd_cpu_dais(rtd, i, cpu_dai)

				if (!snd_soc_dai_stream_valid(cpu_dai,

							      stream)) {

					dev_err(rtd->card->dev,

						"CPU DAI %s for rtd %s does not support playback\n",

						cpu_dai->name,

						rtd->dai_link->stream_name);

					return -EINVAL;

				}

			playback = 1;

		}

		if (rtd->dai_link->dpcm_capture) {

			stream = SNDRV_PCM_STREAM_CAPTURE;



		playback = rtd->dai_link->dpcm_playback &&

			   snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_PLAYBACK);

		capture = rtd->dai_link->dpcm_capture &&

			  snd_soc_dai_stream_valid(cpu_dai, SNDRV_PCM_STREAM_CAPTURE);

			for_each_rtd_cpu_dais(rtd, i, cpu_dai)

				if (!snd_soc_dai_stream_valid(cpu_dai,

							      stream)) {

					dev_err(rtd->card->dev,

						"CPU DAI %s for rtd %s does not support capture\n",

						cpu_dai->name,

						rtd->dai_link->stream_name);

					return -EINVAL;

				}

			capture = 1;

		}

	} else {

		/* Adapt stream for codec2codec links */

		int cpu_capture = rtd->dai_link->params ?

CRA Git | Maintained and supported by SUSTech CRA and CCSE