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

    drm/radeon: fix logic error in atombios_encoders.c

to the 3.6-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-radeon-fix-logic-error-in-atombios_encoders.c.patch
and it can be found in the queue-3.6 subdirectory.

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


>From b9196395c905edec512dfd6690428084228c16ec Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 14 Nov 2012 09:10:39 -0500
Subject: drm/radeon: fix logic error in atombios_encoders.c

From: Alex Deucher <[email protected]>

commit b9196395c905edec512dfd6690428084228c16ec upstream.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=50431

Reported-by: David Binderman <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/gpu/drm/radeon/atombios_encoders.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1421,7 +1421,7 @@ radeon_atom_encoder_dpms_dig(struct drm_
                        atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_SETUP, 0, 0);
                        atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE, 0, 0);
                        /* some early dce3.2 boards have a bug in their 
transmitter control table */
-                       if ((rdev->family != CHIP_RV710) || (rdev->family != 
CHIP_RV730))
+                       if ((rdev->family != CHIP_RV710) && (rdev->family != 
CHIP_RV730))
                                atombios_dig_transmitter_setup(encoder, 
ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0);
                }
                if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(encoder)) && 
connector) {


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

queue-3.6/drm-radeon-fix-logic-error-in-atombios_encoders.c.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