tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: Intel: boards: fix HDMI playback lookup when HDMI-In capture used

In boards like adl_lt6911_hdmi_ssp/mtl_lt6911_hdmi_ssp/rpl_lt6911_hdmi_ssp,
HDMI is supported both for playback via normal HDA display codec,
as well as PCM capture from HDMI-In over I2S.

The common board driver function hda_dsp_hdmi_pcm_handle() has an
invalid assumption that "HDMI" is only used to identify playback HDMI
PCMs on the card. This will result in failures if HDMI-In PCMs are
defined in topology using the string "HDMI", and they are registered
before the playback PCMs.

Fix the issue by explicitly looking for FE playback PCMs.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20251112115045.337062-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kai Vehmanen and committed by
Mark Brown 4d6e2211 2b0d5d9b

+12 -3
+12 -3
sound/soc/intel/boards/hda_dsp_common.c
··· 15 15 16 16 /* 17 17 * Search card topology and return PCM device number 18 - * matching Nth HDMI device (zero-based index). 18 + * matching Nth playback HDMI device (zero-based index). 19 19 */ 20 20 static struct snd_pcm *hda_dsp_hdmi_pcm_handle(struct snd_soc_card *card, 21 21 int hdmi_idx) ··· 25 25 int i = 0; 26 26 27 27 for_each_card_rtds(card, rtd) { 28 - spcm = rtd->pcm ? 29 - rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].pcm : NULL; 28 + /* ignore BE PCMs */ 29 + if (rtd->dai_link && rtd->dai_link->no_pcm) 30 + continue; 31 + 32 + spcm = rtd->pcm; 33 + 34 + /* ignore PCMs with no playback streams */ 35 + if (!spcm || !spcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) 36 + continue; 37 + 38 + /* look for FE PCMs with name "HDMI x" */ 30 39 if (spcm && strstr(spcm->id, "HDMI")) { 31 40 if (i == hdmi_idx) 32 41 return rtd->pcm;