Commit fdd49c51 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda/hdmi - Don't fall back to generic when i915 binding fails

When i915 component binding fails, it means that HDMI isn't applicable
anyway.  Although the probe with the generic HDMI parser would still
work, it's essentially useless, hence better to be left unbound.

This patch mimics the probe_id field at failing the i915 component
binding so that the generic HDMI won't be bound after that.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1adca4b0
...@@ -84,6 +84,7 @@ struct hda_bus { ...@@ -84,6 +84,7 @@ struct hda_bus {
*/ */
typedef int (*hda_codec_patch_t)(struct hda_codec *); typedef int (*hda_codec_patch_t)(struct hda_codec *);
#define HDA_CODEC_ID_SKIP_PROBE 0x00000001
#define HDA_CODEC_ID_GENERIC_HDMI 0x00000101 #define HDA_CODEC_ID_GENERIC_HDMI 0x00000101
#define HDA_CODEC_ID_GENERIC 0x00000201 #define HDA_CODEC_ID_GENERIC 0x00000201
......
...@@ -2542,6 +2542,8 @@ static int alloc_intel_hdmi(struct hda_codec *codec) ...@@ -2542,6 +2542,8 @@ static int alloc_intel_hdmi(struct hda_codec *codec)
/* requires i915 binding */ /* requires i915 binding */
if (!codec->bus->core.audio_component) { if (!codec->bus->core.audio_component) {
codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n"); codec_info(codec, "No i915 binding for Intel HDMI/DP codec\n");
/* set probe_id here to prevent generic fallback binding */
codec->probe_id = HDA_CODEC_ID_SKIP_PROBE;
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment