diff options
| author |  Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
| 2023-11-24 14:40:15 +0200 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2023-11-24 12:55:04 +0000 |
| commit | 3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8 (patch) | |
| tree | 8ab6b26246abc4204deffd61dfe02030cb918c2b /sound | |
| parent | ASoC: fsl_xcvr: refine the requested phy clock frequency (diff) | |
| download | linux-3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8.tar.gz linux-3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8.tar.bz2 linux-3d1dc8b1030df8ca0fdfd4905c88ee10db943bf8.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/skl_hda_dsp_generic.c b/sound/soc/intel/boards/skl_hda_dsp_generic.c index 6c6ef63cd5d9..6e172719c979 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_generic.c +++ b/sound/soc/intel/boards/skl_hda_dsp_generic.c @@ -154,6 +154,8 @@ static int skl_hda_fill_card_info(struct snd_soc_acpi_mach_params *mach_params) card->dapm_widgets = skl_hda_widgets; card->num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets); if (!ctx->idisp_codec) { + card->dapm_routes = &skl_hda_map[IDISP_ROUTE_COUNT]; + num_route -= IDISP_ROUTE_COUNT; for (i = 0; i < IDISP_DAI_COUNT; i++) { skl_hda_be_dai_links[i].codecs = &snd_soc_dummy_dlc; skl_hda_be_dai_links[i].num_codecs = 1; |