diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2018-06-27 11:48:18 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-28 12:17:02 +0200 |
| commit | 4f2bd18b191a10660782f2f1ccc989b000b2be63 (patch) | |
| tree | c860ab8897e833b703c98128fc7bf977e1ca8669 /sound/soc/soc-pcm.c | |
| parent | ASoC: qdsp6: qdafe: fix some off by one bugs (diff) | |
| download | linux-4f2bd18b191a10660782f2f1ccc989b000b2be63.tar.xz linux-4f2bd18b191a10660782f2f1ccc989b000b2be63.zip | |
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.
Cc: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -rw-r--r-- | sound/soc/soc-pcm.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 63f96cde046a..6ee4131941df 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -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 |