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

[Ben Hutchings]

Author: benh
Date: Wed Sep  1 23:26:12 2010
New Revision: 16232

Log:
Rename and apply "drm/radeon/kms: add additional quirk for Acer rv620 laptop"

This was picked from 2.6.34.6 but left out of the patch series.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch
      - copied unchanged from r16221, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch
Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/22

Copied: dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch (from r16221, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.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-add-additional-quirk-for-Acer-rv620-l.patch	Wed Sep  1 23:26:12 2010	(r16232, copy of r16221, dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch)
@@ -0,0 +1,59 @@
+From adf5b7f758880954195309961dca23aa2c6e30c3 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri, 6 Aug 2010 00:27:44 -0400
+Subject: [PATCH 01/10] drm/radeon/kms: add additional quirk for Acer rv620 laptop
+
+commit 9ea2c4be978d597076ddc6c550557de5d243cea8 upstream.
+
+HPD pins are reversed
+
+Fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=29387
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/gpu/drm/radeon/radeon_atombios.c |   14 ++++++++++++--
+ 1 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
+index e249933..1cb96e9 100644
+--- a/drivers/gpu/drm/radeon/radeon_atombios.c
++++ b/drivers/gpu/drm/radeon/radeon_atombios.c
+@@ -196,6 +196,7 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
+ 				     uint16_t *line_mux,
+ 				     struct radeon_hpd *hpd)
+ {
++	struct radeon_device *rdev = dev->dev_private;
+ 
+ 	/* Asus M2A-VM HDMI board lists the DVI port as HDMI */
+ 	if ((dev->pdev->device == 0x791e) &&
+@@ -296,13 +297,22 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,
+ 		}
+ 	}
+ 
+-	/* Acer laptop reports DVI-D as DVI-I */
++	/* Acer laptop reports DVI-D as DVI-I and hpd pins reversed */
+ 	if ((dev->pdev->device == 0x95c4) &&
+ 	    (dev->pdev->subsystem_vendor == 0x1025) &&
+ 	    (dev->pdev->subsystem_device == 0x013c)) {
++		struct radeon_gpio_rec gpio;
++
+ 		if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&
+-		    (supported_device == ATOM_DEVICE_DFP1_SUPPORT))
++		    (supported_device == ATOM_DEVICE_DFP1_SUPPORT)) {
++			gpio = radeon_lookup_gpio(rdev, 6);
++			*hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio);
+ 			*connector_type = DRM_MODE_CONNECTOR_DVID;
++		} else if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) &&
++			   (supported_device == ATOM_DEVICE_DFP1_SUPPORT)) {
++			gpio = radeon_lookup_gpio(rdev, 7);
++			*hpd = radeon_atom_get_hpd_info_from_gpio(rdev, &gpio);
++		}
+ 	}
+ 
+ 	/* XFX Pine Group device rv730 reports no VGA DDC lines
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Tue Aug 31 05:05:47 2010	(r16231)
+++ dists/sid/linux-2.6/debian/patches/series/22	Wed Sep  1 23:26:12 2010	(r16232)
@@ -18,6 +18,7 @@
 - bugfix/all/can-add-limit-for-nframes-and-clean-up-signed-variables.patch
 + bugfix/all/stable/2.6.32.21.patch
 + debian/mm-Avoid-ABI-change-in-2.6.32.21.patch
++ bugfix/x86/drm-radeon-kms-add-additional-quirk-for-Acer-rv620-l.patch
 + bugfix/x86/drm-i915-fixup-pageflip-ringbuffer-commands-for-i8xx.patch
 + bugfix/x86/drm-i915-i8xx-also-doesn-t-like-multiple-oustanding-.patch
 + bugfix/x86/drm-i915-edp-Flush-the-write-before-waiting-for-PLLs.patch