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

[Ben Hutchings]

Author: benh
Date: Sat Oct 16 23:56:41 2010
New Revision: 16451

Log:
[x86] radeon: Add quirks to make HP nx6125 and dv5000 laptops resume (Closes: #583968)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-add-quirk-to-make-HP-nx6125-laptop-resume.patch
   dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-add-quirk-to-make-HP-DV5000-laptop-resume.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/26

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Oct 15 15:35:38 2010	(r16450)
+++ dists/sid/linux-2.6/debian/changelog	Sat Oct 16 23:56:41 2010	(r16451)
@@ -9,6 +9,10 @@
   * [openvz] Enable ioprio. (closes: #596772)
     Thanks Daniel Hahler <debian-bugs at thequod.de>
 
+  [ Ben Hutchings ]
+  * [x86] radeon: Add quirks to make HP nx6125 and dv5000 laptops resume
+    (Closes: #583968)
+
  -- dann frazier <dannf at debian.org>  Fri, 15 Oct 2010 16:03:12 +0100
 
 linux-2.6 (2.6.32-25) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-add-quirk-to-make-HP-nx6125-laptop-resume.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-add-quirk-to-make-HP-nx6125-laptop-resume.patch	Sat Oct 16 23:56:41 2010	(r16451)
@@ -0,0 +1,35 @@
+From: Dave Airlie <airlied at redhat.com>
+Date: Wed, 30 Jun 2010 13:26:11 +1000
+Subject: [PATCH] drm/radeon: add quirk to make HP nx6125 laptop resume.
+
+commit 580b4fffbbdc3c899ee1f8189ba321bd60b48840 upstream.
+
+For some reason on resume, executing the BIOS scripts locks up the whole chipset, by avoiding the dynclk table the machine resumes properly and seems to function okay.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/radeon/radeon_combios.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
+index 08e156a..392bc4d 100644
+--- a/drivers/gpu/drm/radeon/radeon_combios.c
++++ b/drivers/gpu/drm/radeon/radeon_combios.c
+@@ -3051,6 +3051,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
+ 		combios_write_ram_size(dev);
+ 	}
+ 
++	/* quirk for rs4xx HP nx6125 laptop to make it resume
++	 * - it hangs on resume inside the dynclk 1 table.
++	 */
++	if (rdev->family == CHIP_RS480 &&
++	    rdev->pdev->subsystem_vendor == 0x103c &&
++	    rdev->pdev->subsystem_device == 0x308b)
++		return;
++
+ 	/* DYN CLK 1 */
+ 	table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
+ 	if (table)
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-radeon-kms-add-quirk-to-make-HP-DV5000-laptop-resume.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-quirk-to-make-HP-DV5000-laptop-resume.patch	Sat Oct 16 23:56:41 2010	(r16451)
@@ -0,0 +1,38 @@
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 21 Jul 2010 23:54:35 -0400
+Subject: [PATCH] drm/radeon/kms: add quirk to make HP DV5000 laptop resume
+
+commit 52fa2bbc8ec46255039e2048d616bbd0852ee292 upstream.
+
+Fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=29062
+
+Reported-by:  Andres Cimmarusti <acimmarusti at gmail.com>
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/radeon/radeon_combios.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
+index d1c1d8d..2417d7b 100644
+--- a/drivers/gpu/drm/radeon/radeon_combios.c
++++ b/drivers/gpu/drm/radeon/radeon_combios.c
+@@ -3050,6 +3050,14 @@ void radeon_combios_asic_init(struct drm_device *dev)
+ 	    rdev->pdev->subsystem_device == 0x308b)
+ 		return;
+ 
++	/* quirk for rs4xx HP dv5000 laptop to make it resume
++	 * - it hangs on resume inside the dynclk 1 table.
++	 */
++	if (rdev->family == CHIP_RS480 &&
++	    rdev->pdev->subsystem_vendor == 0x103c &&
++	    rdev->pdev->subsystem_device == 0x30a4)
++		return;
++
+ 	/* DYN CLK 1 */
+ 	table = combios_get_table_offset(dev, COMBIOS_DYN_CLK_1_TABLE);
+ 	if (table)
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/26
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/26	Fri Oct 15 15:35:38 2010	(r16450)
+++ dists/sid/linux-2.6/debian/patches/series/26	Sat Oct 16 23:56:41 2010	(r16451)
@@ -1,3 +1,4 @@
 + features/all/xen/pvhvm/0018-xen-do-not-set-xenstored_ready-before-xenbus_probe.patch
 + features/all/xen/pvhvm/0019-xen-do-not-initialize-PV-timers-on-HVM-if-xen_have.patch
-
++ bugfix/x86/drm-radeon-add-quirk-to-make-HP-nx6125-laptop-resume.patch
++ bugfix/x86/drm-radeon-kms-add-quirk-to-make-HP-DV5000-laptop-resume.patch