diff mbox series

ASoC: SOF: add be_hw_params_fixup() for ALH

Message ID 20210201092345.1214232-1-kai.vehmanen@linux.intel.com
State New
Headers show
Series ASoC: SOF: add be_hw_params_fixup() for ALH | expand

Commit Message

Kai Vehmanen Feb. 1, 2021, 9:23 a.m. UTC 
From: Rander Wang <rander.wang@intel.com>

Fixup BE DAI links channel count to match topology settings. Normally the
channel count of BE is equal to FE's so we don't have any issue. For some
cases like DSM with 2-channel FE and 4-channel BE the mismatch of BE and
topology will result in audio issues.

Signed-off-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Keyon Jie <yang.jie@intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 sound/soc/sof/pcm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


base-commit: 8ac9e476b86851c94e0f33bea758e0a00e3f875e

Comments

Mark Brown Feb. 2, 2021, 3:34 p.m. UTC | #1 
On Mon, 1 Feb 2021 11:23:45 +0200, Kai Vehmanen wrote:
> Fixup BE DAI links channel count to match topology settings. Normally the
> channel count of BE is equal to FE's so we don't have any issue. For some
> cases like DSM with 2-channel FE and 4-channel BE the mismatch of BE and
> topology will result in audio issues.

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: SOF: add be_hw_params_fixup() for ALH
      commit: e1711b1f9dfb712aa72ea25e03e0a3f6ef16c4fb

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
diff mbox series

Patch

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 0dc39fbcd81d..61c3fe17342d 100644
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -707,7 +707,12 @@  int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
 		}
 		break;
 	case SOF_DAI_INTEL_ALH:
-		/* do nothing for ALH dai_link */
+		/*
+		 * Dai could run with different channel count compared with
+		 * front end, so get dai channel count from topology
+		 */
+		channels->min = dai->dai_config->alh.channels;
+		channels->max = dai->dai_config->alh.channels;
 		break;
 	case SOF_DAI_IMX_ESAI:
 		rate->min = dai->dai_config->esai.fsync_rate;