ASoC: codecs: hda: Skip HDMI/DP registration if i915 is missing
authorCezary Rojewski <cezary.rojewski@intel.com>
Mon, 26 Feb 2024 12:44:29 +0000 (13:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Mar 2024 08:17:02 +0000 (09:17 +0100)
If i915 does not support given platform but the hardware i.e.: HDAudio
codec is still there, the codec-probing procedure will succeed for such
device but the follow up initialization will always end up with -ENODEV.

While bus could filter out address '2' which Intel's HDMI/DP codecs
always enumerate on, more robust approach is to check for i915 presence
before registering display codecs.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240226124432.1203798-3-cezary.rojewski@intel.com
sound/soc/codecs/hda.c

index d2117e3..7c6bede 100644 (file)
@@ -350,6 +350,11 @@ static int hda_hdev_attach(struct hdac_device *hdev)
        struct hda_codec *codec = dev_to_hda_codec(&hdev->dev);
        struct snd_soc_component_driver *comp_drv;
 
+       if (hda_codec_is_display(codec) && !hdev->bus->audio_component) {
+               dev_dbg(&hdev->dev, "no i915, skip registration for 0x%08x\n", hdev->vendor_id);
+               return -ENODEV;
+       }
+
        comp_drv = devm_kzalloc(&hdev->dev, sizeof(*comp_drv), GFP_KERNEL);
        if (!comp_drv)
                return -ENOMEM;