admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kai Vehmanen
2025-11-12 19:50:45 +08:00
committed by Mark Brown
parent 2b0d5d9b39
commit 4d6e2211ae
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/intel/boards/hda_dsp_common.c
View File

@@ -15,7 +15,7 @@
/*
* Search card topology and return PCM device number
* matching Nth HDMI device (zero-based index).
* matching Nth playback HDMI device (zero-based index).
*/
static struct snd_pcm *hda_dsp_hdmi_pcm_handle(struct snd_soc_card *card,
int hdmi_idx)
@@ -25,8 +25,17 @@ static struct snd_pcm *hda_dsp_hdmi_pcm_handle(struct snd_soc_card *card,
int i = 0;
for_each_card_rtds(card, rtd) {
spcm = rtd->pcm ?
rtd->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].pcm : NULL;
/* ignore BE PCMs */
if (rtd->dai_link && rtd->dai_link->no_pcm)
continue;
spcm = rtd->pcm;
/* ignore PCMs with no playback streams */
if (!spcm || !spcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
continue;
/* look for FE PCMs with name "HDMI x" */
if (spcm && strstr(spcm->id, "HDMI")) {
if (i == hdmi_idx)
return rtd->pcm;