Patch "ALSA: hda - Fix regression of monitor_present flag in eld proc file" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ALSA: hda - Fix regression of monitor_present flag in eld proc file
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-fix-regression-of-monitor_present-flag-in-eld-proc-file.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
023d8218ec0dfc30e11d4ec54f640e8f127d1fbeMon Sep 17 00:00:00 2001
From: Hyungwon Hwang <[email protected]>
Date: Wed, 13 Apr 2016 09:27:39 +0900
Subject: ALSA: hda - Fix regression of monitor_present flag in eld proc file
From: Hyungwon Hwang <[email protected]>
commit 023d8218ec0dfc30e11d4ec54f640e8f127d1fbe upstream.
The commit [bd48128539ab: ALSA: hda - Fix forgotten HDMI monitor_present update] covered the missing update of monitor_present flag, but this caused a regression for devices without the i915 eld notifier. Since the old code supposed that pin_eld->monitor_present was updated by the caller side, the hdmi_present_sense_via_verbs() doesn't update the temporary eld->monitor_present but only pin_eld->monitor_present, which is now overridden in update_eld().
The fix is to update pin_eld->monitor_present as well before calling update_eld().
Note that this may still leave monitor_present flag in an inconsistent state when the driver repolls, but this is at least the old behavior. More proper fix will follow in the later patch.
--- sound/pci/hda/patch_hdmi.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_hdmi.c +2 -0
@@ -1623,6 +1623,8 @@ static bool hdmi_present_sense_via_verbsmutex_lock (&per_pin->lock); pin_eld->monitor_present = !!(present &AC_PINSENSE_PRESENCE ); + eld->monitor_present = pin_eld->monitor_present; +if (pin_eld->monitor_present) eld->eld_valid = !!(present &AC_PINSENSE_ELDV );else
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/alsa-hda-fix-regression-of-monitor_present-flag-in-eld-proc-file.patch