ASoC: Handle multiple codecs with split playback / capture (cde79035) · Commits · 戴 / test

sound/soc/soc-pcm.c

+49 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,24 @@

		#define DPCM_MAX_BE_USERS 8

		/*
		* snd_soc_dai_stream_valid() - check if a DAI supports the given stream
		*
		* Returns true if the DAI supports the indicated stream type.
		*/
		static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)
		{
		struct snd_soc_pcm_stream *codec_stream;

		if (stream == SNDRV_PCM_STREAM_PLAYBACK)
		codec_stream = &dai->driver->playback;
		else
		codec_stream = &dai->driver->capture;

		/* If the codec specifies any rate at all, it supports the stream. */
		return codec_stream->rates;
		}

		/**
		* snd_soc_runtime_activate() - Increment active count for PCM runtime components
		* @rtd: ASoC PCM runtime that is activated
		@@ -371,6 +389,20 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream)

		/* first calculate min/max only for CODECs in the DAI link */
		for (i = 0; i < rtd->num_codecs; i++) {

		/*
		* Skip CODECs which don't support the current stream type.
		* Otherwise, since the rate, channel, and format values will
		* zero in that case, we would have no usable settings left,
		* causing the resulting setup to fail.
		* At least one CODEC should match, otherwise we should have
		* bailed out on a higher level, since there would be no
		* CODEC to support the transfer direction in that case.
		*/
		if (!snd_soc_dai_stream_valid(rtd->codec_dais[i],
		substream->stream))
		continue;

		codec_dai_drv = rtd->codec_dais[i]->driver;
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		codec_stream = &codec_dai_drv->playback;
		@@ -827,6 +859,23 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream,
		struct snd_soc_dai *codec_dai = rtd->codec_dais[i];
		struct snd_pcm_hw_params codec_params;

		/*
		* Skip CODECs which don't support the current stream type,
		* the idea being that if a CODEC is not used for the currently
		* set up transfer direction, it should not need to be
		* configured, especially since the configuration used might
		* not even be supported by that CODEC. There may be cases
		* however where a CODEC needs to be set up although it is
		* actually not being used for the transfer, e.g. if a
		* capture-only CODEC is acting as an LRCLK and/or BCLK master
		* for the DAI link including a playback-only CODEC.
		* If this becomes necessary, we will have to augment the
		* machine driver setup with information on how to act, so
		* we can do the right thing here.
		*/
		if (!snd_soc_dai_stream_valid(codec_dai, substream->stream))
		continue;

		/* copy params for each codec */
		codec_params = *params;

Admin message