redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

MLK-15043-1: ASoC: soc-pcm: add dpcm_merged_chan in snd_soc_dai_link 

According to commit b073ed4e21 ("ASoC: soc-pcm: DPCM cares BE format"),
Current DPCM only care FE channel, but it will set unsupported channel to
drivers.
So add dpcm_merged_chan, which is used to merge the BE's codec
channels configuration to FE if it exist in snd_soc_dai_link. And
dpcm_runtime_base_chan function is to get the channel configuration of BE,
which likes the dpcm_runtime_base_format function.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
steinar/wifi_calib_4_9_kernel
Shengjiu Wang 2017-06-14 17:35:20 +08:00
parent c548ad11ca
commit 19ff1095d4
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc.h
View File

@ -1052,6 +1052,7 @@ struct snd_soc_dai_link {
/* DPCM used FE & BE merged format */
unsigned int dpcm_merged_format:1;
unsigned int dpcm_merged_chan:1;
/* pmdown_time is ignored at stop */
unsigned int ignore_pmdown_time:1;

43
sound/soc/soc-pcm.c
View File

@ -1630,6 +1630,43 @@ static u64 dpcm_runtime_base_format(struct snd_pcm_substream *substream)
return formats;
}
static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream,
unsigned int *channels_min,
unsigned int *channels_max)
{
struct snd_soc_pcm_runtime *fe = substream->private_data;
struct snd_soc_dpcm *dpcm;
int stream = substream->stream;
*channels_min = 0;
*channels_max = UINT_MAX;
if (!fe->dai_link->dpcm_merged_chan)
return;
/*
* It returns merged BE codec channel;
* if FE want to use it (= dpcm_merged_chan)
*/
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 *codec_dai_drv;
struct snd_soc_pcm_stream *codec_stream;
int i;
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
codec_stream = &codec_dai_drv->capture;
*channels_min = max(*channels_min, codec_stream->channels_min);
*channels_max = min(*channels_max, codec_stream->channels_max);
}
}
}
static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
@ -1637,11 +1674,17 @@ static void dpcm_set_fe_runtime(struct snd_pcm_substream *substream)
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai_driver *cpu_dai_drv = cpu_dai->driver;
u64 format = dpcm_runtime_base_format(substream);
unsigned int channels_min = 0, channels_max = UINT_MAX;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
dpcm_init_runtime_hw(runtime, &cpu_dai_drv->playback, format);
else
dpcm_init_runtime_hw(runtime, &cpu_dai_drv->capture, format);
dpcm_runtime_base_chan(substream, &channels_min, &channels_max);
runtime->hw.channels_min = max(channels_min, runtime->hw.channels_min);
runtime->hw.channels_max = min(channels_max, runtime->hw.channels_max);
}
static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd);