ASoC: dpcm: extend channel merging to the backend cpu dai
PATCH 1/1 ASoC: dpcm: extend channel merging to the backend cpu dai
Extend dpcm_merge_chan to also check backend cpu dai channels capabilities. Apply the same policy as soc_pcm_init_runtime_hw() for multicodec links and only check cpu dai in this case.
---
Hi Mark,
As you've probably noticed, this patch applies on top Jiada's patch pf4c277b817cc ("ASoC: soc-pcm: DPCM cares BE channel constraint")
Regards.
Jerome
sound/soc/soc-pcm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
sound/soc/soc-pcm.c +17 -3
@@ -1728,12 +1728,26 @@ static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream,list_for_each_entry (dpcm, &fe->dpcm[stream].be_clients, list_be) {struct snd_soc_pcm_runtime *be = dpcm->be; +struct snd_soc_dai_driver *cpu_dai_drv = be->cpu_dai->driver;struct snd_soc_dai_driver *codec_dai_drv;struct snd_soc_pcm_stream *codec_stream; -int i; +struct snd_soc_pcm_stream *cpu_stream; + +if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) + cpu_stream = &cpu_dai_drv->playback; +else + cpu_stream = &cpu_dai_drv->capture; + + *channels_min =max (*channels_min, cpu_stream->channels_min); + *channels_max =min (*channels_max, cpu_stream->channels_max); + +/* +* chan min/max cannot be enforced if there are multiple CODEC +* DAIs connected to a single CPU DAI, use CPU DAI's directly +*/ +if (be->num_codecs ==1 ) { + codec_dai_drv = be->codec_dais[0 ]->driver; -for (i =0 ; i < be->num_codecs; i++) { - codec_dai_drv = be->codec_dais[i]->driver;if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) codec_stream = &codec_dai_drv->playback;else
Signature · 1 line
2.14.4
Mark Brown
maintainerQuoted 2 lines · Jerome Brunet
As you've probably noticed, this patch applies on top Jiada's patch pf4c277b817cc ("ASoC: soc-pcm: DPCM cares BE channel constraint")
That isn't a valid hash...
Quoted 6 lines · Mark Brown
Quoted 2 lines · Jerome Brunet
As you've probably noticed, this patch applies on top Jiada's patch pf4c277b817cc ("ASoC: soc-pcm: DPCM cares BE channel constraint")
That isn't a valid hash...
Indeed :) Sorry about that, it was f4c277b817cc (drop the p)
Mark Brown
maintainerApplied "ASoC: dpcm: extend channel merging to the backend cpu dai" to the asoc tree
In reply to Jerome BrunetThe patch
ASoC: dpcm: extend channel merging to the backend cpu dai
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
4f2bd18b191a10660782f2f1ccc989b000b2be63Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Wed, 27 Jun 2018 11:48:18 +0200
Subject: [PATCH] ASoC: dpcm: extend channel merging to the backend cpu dai
Extend dpcm_merge_chan to also check backend cpu dai channels capabilities. Apply the same policy as soc_pcm_init_runtime_hw() for multicodec links and only check cpu dai in this case.
--- sound/soc/soc-pcm.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
sound/soc/soc-pcm.c +17 -3
@@ -1736,12 +1736,26 @@ static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream,list_for_each_entry (dpcm, &fe->dpcm[stream].be_clients, list_be) {struct snd_soc_pcm_runtime *be = dpcm->be; +struct snd_soc_dai_driver *cpu_dai_drv = be->cpu_dai->driver;struct snd_soc_dai_driver *codec_dai_drv;struct snd_soc_pcm_stream *codec_stream; -int i; +struct snd_soc_pcm_stream *cpu_stream; + +if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) + cpu_stream = &cpu_dai_drv->playback; +else + cpu_stream = &cpu_dai_drv->capture; + + *channels_min =max (*channels_min, cpu_stream->channels_min); + *channels_max =min (*channels_max, cpu_stream->channels_max); + +/* +* chan min/max cannot be enforced if there are multiple CODEC +* DAIs connected to a single CPU DAI, use CPU DAI's directly +*/ +if (be->num_codecs ==1 ) { + codec_dai_drv = be->codec_dais[0 ]->driver; -for (i =0 ; i < be->num_codecs; i++) { - codec_dai_drv = be->codec_dais[i]->driver;if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) codec_stream = &codec_dai_drv->playback;else
Signature · 1 line
2.18.0.rc2