2.6.35-longterm review patch.  If anyone has any objections, please let me know.

------------------
From: Alex Deucher <[email protected]>

commit f598aa7593427ffe3a61e7767c34bd695a5e7ed0 upstream.

Reported-by: 屋国遥 <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>

---
 drivers/gpu/drm/radeon/radeon_atombios.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

Index: linux-2.6.35.y/drivers/gpu/drm/radeon/radeon_atombios.c
===================================================================
--- linux-2.6.35.y.orig/drivers/gpu/drm/radeon/radeon_atombios.c        
2011-03-29 22:51:38.578736036 -0700
+++ linux-2.6.35.y/drivers/gpu/drm/radeon/radeon_atombios.c     2011-03-29 
23:55:09.579222069 -0700
@@ -289,6 +289,17 @@
                        *line_mux = 0x90;
        }
 
+       /* mac rv630 */
+       if ((dev->pdev->device == 0x9588) &&
+           (dev->pdev->subsystem_vendor == 0x106b) &&
+           (dev->pdev->subsystem_device == 0x00a6)) {
+               if ((supported_device == ATOM_DEVICE_TV1_SUPPORT) &&
+                   (*connector_type == DRM_MODE_CONNECTOR_DVII)) {
+                       *connector_type = DRM_MODE_CONNECTOR_9PinDIN;
+                       *line_mux = CONNECTOR_7PIN_DIN_ENUM_ID1;
+               }
+       }
+
        /* ASUS HD 3600 XT board lists the DVI port as HDMI */
        if ((dev->pdev->device == 0x9598) &&
            (dev->pdev->subsystem_vendor == 0x1043) &&

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to