Skip to content

Commit 3d1dc8b

Browse files
ujfalusibroonie
authored andcommitted
ASoC: Intel: skl_hda_dsp_generic: Drop HDMI routes when HDMI is not available
When the HDMI is not present due to disabled display support we will use dummy codec and the HDMI routes will refer to non existent DAPM widgets. Trim the route list from the HDMI routes to be able to probe the card even if the HDMI dais are not registered. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20231124124015.15878-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 347ecf2 commit 3d1dc8b

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

sound/soc/intel/boards/skl_hda_dsp_generic.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params)
154154
card->dapm_widgets = skl_hda_widgets;
155155
card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets);
156156
if (!ctx->idisp_codec) {
157+
card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT];
158+
num_route -= IDISP_ROUTE_COUNT;
157159
for (i = 0; i < IDISP_DAI_COUNT; i++) {
158160
skl_hda_be_dai_links[i].codecs = &snd_soc_dummy_dlc;
159161
skl_hda_be_dai_links[i].num_codecs = 1;

0 commit comments

Comments
 (0)