Skip to contentSkip to conversation

Patch "ALSA: hda - Limit i915 HDMI binding only for HSW and later" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ALSA: hda - Limit i915 HDMI binding only for HSW and later

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
alsa-hda-limit-i915-hdmi-binding-only-for-hsw-and-later.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b62232d429fa8b1dcf5d8503aa5a5397a03e646a Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Tue, 15 Mar 2016 18:15:26 +0100
Subject: ALSA: hda - Limit i915 HDMI binding only for HSW and later
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Takashi Iwai <[email protected]>

commit b62232d429fa8b1dcf5d8503aa5a5397a03e646a upstream.

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.

---
 sound/pci/hda/patch_hdmi.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/hda/patch_hdmi.c +3 -2
@@ -2460,9 +2460,10 @@ static int patch_generic_hdmi(struct hda
 	codec->spec = spec;
 	hdmi_array_init(spec, 4);
 
-	/* Try to bind with i915 for any Intel codecs (if not done yet) */
+	/* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */
 	if (!codec_has_acomp(codec) &&
-	    (codec->core.vendor_id >> 16) == 0x8086)
+	    (codec->core.vendor_id >> 16) == 0x8086 &&
+	    is_haswell_plus(codec))
 		if (!snd_hdac_i915_init(&codec->bus->core))
 			spec->i915_bound = true;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/alsa-hda-apply-reboot-d3-fix-for-cx20724-codec-too.patch queue-4.5/alsa-intel8x0-add-clock-quirk-entry-for-ad1981b-on-ibm-thinkpad-x41.patch queue-4.5/alsa-hda-add-new-gpu-codec-id-0x10de0082-to-snd-hda.patch queue-4.5/alsa-hda-limit-i915-hdmi-binding-only-for-hsw-and-later.patch queue-4.5/alsa-hda-fix-unexpected-resume-through-regmap-code-path.patch queue-4.5/alsa-hda-fix-missing-eld-update-at-unplugging.patch queue-4.5/alsa-hda-really-restrict-i915-notifier-to-hsw.patch queue-4.5/alsa-usb-audio-add-microsoft-hd-5001-to-quirks.patch queue-4.5/alsa-hda-workaround-for-unbalanced-i915-power-refcount-by-concurrent-probe.patch queue-4.5/alsa-usb-audio-fix-null-dereference-in-create_fixed_stream_quirk.patch queue-4.5/alsa-hda-fix-spurious-kernel-warning-on-baytrail-hdmi.patch queue-4.5/alsa-usb-audio-minor-code-cleanup-in-create_fixed_stream_quirk.patch queue-4.5/alsa-pcm-avoid-bug-string-for-warnings-again.patch queue-4.5/alsa-usb-audio-fix-double-free-in-error-paths-after-snd_usb_add_audio_stream-call.patch queue-4.5/alsa-hda-fix-unconditional-gpio-toggle-via-automute.patch queue-4.5/alsa-hda-don-t-handle-eld-notify-from-invalid-port.patch queue-4.5/alsa-usb-audio-add-sanity-checks-for-endpoint-accesses.patch queue-4.5/alsa-hda-fix-the-mic-mute-button-and-led-problem-for-a-lenovo-aio.patch queue-4.5/alsa-hda-fix-forgotten-hdmi-monitor_present-update.patch