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

    drm/i915: fix ELD writing for SandyBridge

to the 3.2-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:
     drm-i915-fix-eld-writing-for-sandybridge.patch
and it can be found in the queue-3.2 subdirectory.

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


>From b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8 Mon Sep 17 00:00:00 2001
From: Wu Fengguang <[email protected]>
Date: Fri, 9 Dec 2011 20:42:17 +0800
Subject: drm/i915: fix ELD writing for SandyBridge

From: Wu Fengguang <[email protected]>

commit b3f33cbf7ace8fc149993ee35e0d0fd57f41d6d8 upstream.

SandyBridge should be using the same register addresses as IvyBridge.

Signed-off-by: Wu Fengguang <[email protected]>
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Eugeni Dodonov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/i915/intel_display.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5876,14 +5876,14 @@ static void ironlake_write_eld(struct dr
        int aud_cntl_st;
        int aud_cntrl_st2;
 
-       if (IS_IVYBRIDGE(connector->dev)) {
-               hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A;
-               aud_cntl_st = GEN7_AUD_CNTRL_ST_A;
-               aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2;
-       } else {
+       if (HAS_PCH_IBX(connector->dev)) {
                hdmiw_hdmiedid = GEN5_HDMIW_HDMIEDID_A;
                aud_cntl_st = GEN5_AUD_CNTL_ST_A;
                aud_cntrl_st2 = GEN5_AUD_CNTL_ST2;
+       } else {
+               hdmiw_hdmiedid = GEN7_HDMIW_HDMIEDID_A;
+               aud_cntl_st = GEN7_AUD_CNTRL_ST_A;
+               aud_cntrl_st2 = GEN7_AUD_CNTRL_ST2;
        }
 
        i = to_intel_crtc(crtc)->pipe;


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

queue-3.2/drm-i915-fix-eld-writing-for-sandybridge.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to