Skip to content

Commit b62232d

Browse files
committed
ALSA: hda - Limit i915 HDMI binding only for HSW and later
It turned out that the pre-HSW Intel chips are incompatible with the naive assumption we had -- the fixed mapping between the port and the HD-audio widget. This may result in the bad access, as captured by the recent patch to add a WARN_ON() for the port mapping check. As a quick workaround, disable the i915 audio component binding for all pre-Haswell models. Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: <stable@vger.kernel.org> # v4.5 Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 1f7c665 commit b62232d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/pci/hda/patch_hdmi.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,9 +2243,10 @@ static int patch_generic_hdmi(struct hda_codec *codec)
22432243
codec->spec = spec;
22442244
hdmi_array_init(spec, 4);
22452245

2246-
/* Try to bind with i915 for any Intel codecs (if not done yet) */
2246+
/* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */
22472247
if (!codec_has_acomp(codec) &&
2248-
(codec->core.vendor_id >> 16) == 0x8086)
2248+
(codec->core.vendor_id >> 16) == 0x8086 &&
2249+
is_haswell_plus(codec))
22492250
if (!snd_hdac_i915_init(&codec->bus->core))
22502251
spec->i915_bound = true;
22512252

0 commit comments

Comments
 (0)