Unverified Commit f6c04af5 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-pcm: add soc_pcm_hw_update_rate() 



To update hw, we need to follow setting order

	1) set hw->rates
	2) call snd_pcm_limit_hw_rates()
	3) update hw->rate_min/max

To avoid random settings, this patch adds new soc_pcm_hw_update_rate()
and share updating code.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/87sg6c90qv.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-pcm.c

+27 −29
Original line number Diff line number Diff line
@@ -473,6 +473,26 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) 
	soc_pcm_set_msb(substream, cpu_bits);

}



static void soc_pcm_hw_init(struct snd_pcm_hardware *hw)

{

	hw->rates		= UINT_MAX;

	hw->rate_min		= 0;

	hw->rate_max		= UINT_MAX;

}



static void soc_pcm_hw_update_rate(struct snd_pcm_hardware *hw,

				   struct snd_soc_pcm_stream *p)

{

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



	/* setup hw->rate_min/max via hw->rates first */

	snd_pcm_hw_limit_rates(hw);



	/* update hw->rate_min/max by snd_soc_pcm_stream */

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

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

}



/**

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

 * @rtd: ASoC PCM runtime
@@ -491,12 +511,11 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 
	struct snd_soc_pcm_stream *cpu_stream;

	unsigned int chan_min = 0, chan_max = UINT_MAX;

	unsigned int cpu_chan_min = 0, cpu_chan_max = UINT_MAX;

	unsigned int rate_min = 0, rate_max = UINT_MAX;

	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 i;



	soc_pcm_hw_init(hw);



	/* first calculate min/max only for CPUs in the DAI link */

	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
@@ -513,11 +532,8 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 


		cpu_chan_min = max(cpu_chan_min, cpu_stream->channels_min);

		cpu_chan_max = min(cpu_chan_max, cpu_stream->channels_max);

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

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

		soc_pcm_hw_update_rate(hw, cpu_stream);

		formats &= cpu_stream->formats;

		cpu_rates = snd_pcm_rate_mask_intersect(cpu_stream->rates,

							cpu_rates);

	}



	/* second calculate min/max only for CODECs in the DAI link */
@@ -536,10 +552,8 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 


		chan_min = max(chan_min, codec_stream->channels_min);

		chan_max = min(chan_max, codec_stream->channels_max);

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

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

		soc_pcm_hw_update_rate(hw, codec_stream);

		formats &= codec_stream->formats;

		rates = snd_pcm_rate_mask_intersect(codec_stream->rates, rates);

	}



	/* Verify both a valid CPU DAI and a valid CODEC DAI were found */
@@ -560,14 +574,6 @@ int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd, 
	hw->channels_min = max(chan_min, cpu_chan_min);

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

	hw->formats = formats;

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



	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;

}
@@ -1514,12 +1520,9 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) 
static void dpcm_init_runtime_hw(struct snd_pcm_runtime *runtime,

				 struct snd_soc_pcm_stream *stream)

{

	runtime->hw.rates = stream->rates;



	snd_pcm_limit_hw_rates(runtime);

	struct snd_pcm_hardware *hw = &runtime->hw;



	runtime->hw.rate_min = stream->rate_min;

	runtime->hw.rate_max = min_not_zero(stream->rate_max, UINT_MAX);

	soc_pcm_hw_update_rate(hw, stream);

	runtime->hw.channels_min = stream->channels_min;

	runtime->hw.channels_max = stream->channels_max;

	if (runtime->hw.formats)
@@ -1651,12 +1654,7 @@ static void dpcm_runtime_merge_rate(struct snd_pcm_substream *substream, 


			pcm = snd_soc_dai_get_pcm_stream(dai, stream);



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



			snd_pcm_limit_hw_rates(runtime);



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

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

			soc_pcm_hw_update_rate(hw, pcm);

		}

	}

}