[kernel] r15879 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ben Hutchings]

Author: benh
Date: Wed Jun 16 01:06:19 2010
New Revision: 15879

Log:
radeon: Fix MacBook Pro connector quirk (Closes: #585943)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-fix-macbookpro-connector-quirk.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/16

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Jun 15 12:45:12 2010	(r15878)
+++ dists/sid/linux-2.6/debian/changelog	Wed Jun 16 01:06:19 2010	(r15879)
@@ -29,6 +29,7 @@
     (Closes: #585661)
     - option, qcserial: Use generic USB WWAN code
     - qcserial: Add support for Qualcomm Gobi 2000 devices
+  * radeon: Fix MacBook Pro connector quirk (Closes: #585943)
 
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-fix-macbookpro-connector-quirk.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-fix-macbookpro-connector-quirk.patch	Wed Jun 16 01:06:19 2010	(r15879)
@@ -0,0 +1,28 @@
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri, 26 Mar 2010 17:14:37 -0400
+Subject: [PATCH] drm/radeon/kms: fix macbookpro connector quirk
+
+commit e1e8a5dd4faf356b5d31c620c5787eaa83ee831d upstream.
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
+index f0ea7f8..1fff955 100644
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -264,6 +264,8 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
+ 		if ((supported_device == ATOM_DEVICE_CRT1_SUPPORT) ||
+ 		    (supported_device == ATOM_DEVICE_DFP2_SUPPORT))
+ 			return false;
++		if (supported_device == ATOM_DEVICE_CRT2_SUPPORT)
++			*line_mux = 0x90;
+ 	}
+ 
+ 	/* ASUS HD 3600 XT board lists the DVI port as HDMI */
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/16	Tue Jun 15 12:45:12 2010	(r15878)
+++ dists/sid/linux-2.6/debian/patches/series/16	Wed Jun 16 01:06:19 2010	(r15879)
@@ -142,3 +142,4 @@
 + features/all/USB-option-Use-generic-USB-wwan-code.patch
 + features/all/USB-qcserial-Use-generic-USB-wwan-code.patch
 + features/all/USB-qcserial-Add-support-for-Qualcomm-Gobi-2000.patch
++ bugfix/x86/drm-radeon-kms-fix-macbookpro-connector-quirk.patch