Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions sound/soc/intel/boards/skl_hda_dsp_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,22 @@ static void skl_set_hda_codec_autosuspend_delay(struct snd_soc_card *card)
#define DMIC01_BE_ID 6
#define DMIC16K_BE_ID 7
#define BT_OFFLOAD_BE_ID 8
#define HDMI_IN_BE_ID 9

#define HDA_LINK_ORDER SOF_LINK_ORDER(SOF_LINK_IDISP_HDMI, \
SOF_LINK_HDA, \
SOF_LINK_DMIC01, \
SOF_LINK_DMIC16K, \
SOF_LINK_BT_OFFLOAD, \
SOF_LINK_NONE, \
SOF_LINK_HDMI_IN, \
Comment thread
Copilot marked this conversation as resolved.
Resolved
SOF_LINK_NONE)

#define HDA_LINK_IDS SOF_LINK_ORDER(IDISP_HDMI_BE_ID, \
HDA_BE_ID, \
DMIC01_BE_ID, \
DMIC16K_BE_ID, \
BT_OFFLOAD_BE_ID, \
0, \
HDMI_IN_BE_ID, \
0)

static unsigned long
Expand All @@ -91,7 +92,8 @@ static int skl_hda_add_dai_link(struct snd_soc_card *card,
struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);

/* Ignore the HDMI PCM link if iDisp is not present */
if (strstr(link->stream_name, "HDMI") && !ctx->hdmi.idisp_codec)
if (strstr(link->stream_name, "HDMI") && !link->no_pcm &&
!link->capture_only && !ctx->hdmi.idisp_codec)
link->ignore = true;

return 0;
Expand Down
3 changes: 2 additions & 1 deletion sound/soc/intel/boards/sof_sdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,8 @@ static int sof_sdw_add_dai_link(struct snd_soc_card *card,
struct intel_mc_ctx *intel_ctx = (struct intel_mc_ctx *)ctx->private;

/* Ignore the HDMI PCM link if iDisp is not present */
if (strstr(link->stream_name, "HDMI") && !intel_ctx->hdmi.idisp_codec)
if (strstr(link->stream_name, "HDMI") && !link->no_pcm &&
!link->capture_only && !intel_ctx->hdmi.idisp_codec)
link->ignore = true;

return 0;
Expand Down
Loading