Unverified Commit 5854a464 authored by Samuel Holland's avatar Samuel Holland Committed by Mark Brown
Browse files

ASoC: pcm: Export parameter intersection logic 



The logic to calculate the subset of stream parameters supported by all
DAIs associated with a PCM stream is nontrivial. Export a helper
function so it can be used to set up simple codec2codec DAI links.

Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20200305051143.60691-3-samuel@sholland.org


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

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -471,6 +471,9 @@ bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd); 
void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);



int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd,

			    struct snd_pcm_hardware *hw, int stream);



int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,

	unsigned int dai_fmt);

sound/soc/soc-pcm.c

+38 −18
Original line number Diff line number Diff line
@@ -587,11 +587,18 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) 
	soc_pcm_set_msb(substream, cpu_bits);

}



static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream)

/**

 * snd_soc_runtime_calc_hw() - Calculate hw limits for a PCM stream

 * @rtd: ASoC PCM runtime

 * @hw: PCM hardware parameters (output)

 * @stream: Direction of the PCM stream

 *

 * Calculates the subset of stream parameters supported by all DAIs

 * associated with the PCM stream.

 */

int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd,

			    struct snd_pcm_hardware *hw, int stream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_pcm_hardware *hw = &runtime->hw;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_dai *cpu_dai;

	struct snd_soc_pcm_stream *codec_stream;
@@ -602,7 +609,6 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
	unsigned int cpu_rate_min = 0, cpu_rate_max = UINT_MAX;

	unsigned int rates = UINT_MAX, cpu_rates = UINT_MAX;

	u64 formats = ULLONG_MAX;

	int stream = substream->stream;

	int i;



	/* first calculate min/max only for CPUs in the DAI link */
@@ -613,12 +619,8 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
		 * 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 CPU should match, otherwise we should have

		 * bailed out on a higher level, since there would be no

		 * CPU to support the transfer direction in that case.

		 */

		if (!snd_soc_dai_stream_valid(cpu_dai,

					      substream->stream))

		if (!snd_soc_dai_stream_valid(cpu_dai, stream))

			continue;



		cpu_stream = snd_soc_dai_get_pcm_stream(cpu_dai, stream);
@@ -640,9 +642,6 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
		 * 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(codec_dai, stream))

			continue;
@@ -657,6 +656,10 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
		rates = snd_pcm_rate_mask_intersect(codec_stream->rates, rates);

	}



	/* Verify both a valid CPU DAI and a valid CODEC DAI were found */

	if (!chan_min || !cpu_chan_min)

		return -EINVAL;



	/*

	 * chan min/max cannot be enforced if there are multiple CODEC DAIs

	 * connected to CPU DAI(s), use CPU DAI's directly and let
@@ -670,18 +673,35 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) 
	/* finally find a intersection between CODECs and CPUs */

	hw->channels_min = max(chan_min, cpu_chan_min);

	hw->channels_max = min(chan_max, cpu_chan_max);

	if (hw->formats)

		hw->formats &= formats;

	else

	hw->formats = formats;

	hw->rates = snd_pcm_rate_mask_intersect(rates, cpu_rates);



	snd_pcm_limit_hw_rates(runtime);

	snd_pcm_hw_limit_rates(hw);



	hw->rate_min = max(hw->rate_min, cpu_rate_min);

	hw->rate_min = max(hw->rate_min, rate_min);

	hw->rate_max = min_not_zero(hw->rate_max, cpu_rate_max);

	hw->rate_max = min_not_zero(hw->rate_max, rate_max);



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_runtime_calc_hw);



static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream)

{

	struct snd_pcm_hardware *hw = &substream->runtime->hw;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	u64 formats = hw->formats;



	/*

	 * At least one CPU and one CODEC should match. Otherwise, we should

	 * have bailed out on a higher level, since there would be no CPU or

	 * CODEC to support the transfer direction in that case.

	 */

	snd_soc_runtime_calc_hw(rtd, hw, substream->stream);



	if (formats)

		hw->formats &= formats;

}



static int soc_pcm_components_open(struct snd_pcm_substream *substream)

CRA Git | Maintained and supported by SUSTech CRA and CCSE