mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 01:53:29 +02:00
4d6e2211ae
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>
101 lines
2.3 KiB
C
101 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
//
|
|
// Copyright(c) 2019 Intel Corporation
|
|
|
|
#include <linux/module.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/hda_codec.h>
|
|
#include <sound/hda_i915.h>
|
|
#include "../../codecs/hdac_hda.h"
|
|
|
|
#include "hda_dsp_common.h"
|
|
|
|
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
|
|
|
|
/*
|
|
* Search card topology and return PCM device number
|
|
* 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)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd;
|
|
struct snd_pcm *spcm;
|
|
int i = 0;
|
|
|
|
for_each_card_rtds(card, rtd) {
|
|
/* 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;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Search card topology and register HDMI PCM related controls
|
|
* to codec driver.
|
|
*/
|
|
int hda_dsp_hdmi_build_controls(struct snd_soc_card *card,
|
|
struct snd_soc_component *comp)
|
|
{
|
|
struct hdac_hda_priv *hda_pvt;
|
|
struct hda_codec *hcodec;
|
|
struct snd_pcm *spcm;
|
|
struct hda_pcm *hpcm;
|
|
int err = 0, i = 0;
|
|
|
|
if (!comp)
|
|
return -EINVAL;
|
|
|
|
hda_pvt = snd_soc_component_get_drvdata(comp);
|
|
hcodec = hda_pvt->codec;
|
|
|
|
list_for_each_entry(hpcm, &hcodec->pcm_list_head, list) {
|
|
spcm = hda_dsp_hdmi_pcm_handle(card, i);
|
|
if (spcm) {
|
|
hpcm->pcm = spcm;
|
|
hpcm->device = spcm->device;
|
|
dev_dbg(card->dev,
|
|
"mapping HDMI converter %d to PCM %d (%p)\n",
|
|
i, hpcm->device, spcm);
|
|
} else {
|
|
hpcm->pcm = NULL;
|
|
hpcm->device = SNDRV_PCM_INVALID_DEVICE;
|
|
dev_warn(card->dev,
|
|
"%s: no PCM in topology for HDMI converter %d\n",
|
|
__func__, i);
|
|
}
|
|
i++;
|
|
}
|
|
snd_hdac_display_power(hcodec->core.bus,
|
|
HDA_CODEC_IDX_CONTROLLER, true);
|
|
err = snd_hda_codec_build_controls(hcodec);
|
|
if (err < 0)
|
|
dev_err(card->dev, "unable to create controls %d\n", err);
|
|
snd_hdac_display_power(hcodec->core.bus,
|
|
HDA_CODEC_IDX_CONTROLLER, false);
|
|
|
|
return err;
|
|
}
|
|
EXPORT_SYMBOL_NS(hda_dsp_hdmi_build_controls, "SND_SOC_INTEL_HDA_DSP_COMMON");
|
|
|
|
#endif
|
|
|
|
MODULE_DESCRIPTION("ASoC Intel HDMI helpers");
|
|
MODULE_LICENSE("GPL");
|