mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
ASoC: soc-pcm: copy dpcm->hw_params and call be_hw_params_fixup every time
Current DPCM doesn't copy dpcm->hw_params and doesn't call be_hw_params if some FE are connected. But 2nd or later FE might want to know BE hw_params. This patch solves this issue. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
92e963f50f
commit
b0639bd242
1 changed files with 12 additions and 12 deletions
|
@ -1866,18 +1866,6 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream)
|
|||
if (!snd_soc_dpcm_be_can_update(fe, be, stream))
|
||||
continue;
|
||||
|
||||
/* only allow hw_params() if no connected FEs are running */
|
||||
if (!snd_soc_dpcm_can_be_params(fe, be, stream))
|
||||
continue;
|
||||
|
||||
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_OPEN) &&
|
||||
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
|
||||
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE))
|
||||
continue;
|
||||
|
||||
dev_dbg(be->dev, "ASoC: hw_params BE %s\n",
|
||||
dpcm->fe->dai_link->name);
|
||||
|
||||
/* copy params for each dpcm */
|
||||
memcpy(&dpcm->hw_params, &fe->dpcm[stream].hw_params,
|
||||
sizeof(struct snd_pcm_hw_params));
|
||||
|
@ -1894,6 +1882,18 @@ int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int stream)
|
|||
}
|
||||
}
|
||||
|
||||
/* only allow hw_params() if no connected FEs are running */
|
||||
if (!snd_soc_dpcm_can_be_params(fe, be, stream))
|
||||
continue;
|
||||
|
||||
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_OPEN) &&
|
||||
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
|
||||
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE))
|
||||
continue;
|
||||
|
||||
dev_dbg(be->dev, "ASoC: hw_params BE %s\n",
|
||||
dpcm->fe->dai_link->name);
|
||||
|
||||
ret = soc_pcm_hw_params(be_substream, &dpcm->hw_params);
|
||||
if (ret < 0) {
|
||||
dev_err(dpcm->be->dev,
|
||||
|
|
Loading…
Reference in a new issue