[kernel] r14804 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Dec 22 01:29:59 2009
New Revision: 14804

Log:
radeon: fix crtc vblank update for r600 (regression in 2.6.32.2)

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/radeon-fix-crtc-vblank-update-for-r600.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/3

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Dec 21 01:37:24 2009	(r14803)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Dec 22 01:29:59 2009	(r14804)
@@ -14,6 +14,7 @@
   * Add stable release 2.6.32.2:
     - KVM: x86 emulator: limit instructions to 15 bytes (CVE-2009-4031)
     - hfs: fix a potential buffer overflow (CVE-2009-4020)
+  * radeon: fix crtc vblank update for r600 (regression in 2.6.32.2)
   * ia64: Include <linux/personality.h> header in <asm/fcntl.h>; fixes
     FTBFS
   * r8169: Allow RTL8168D v1 and v2 to be used without firmware files

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/radeon-fix-crtc-vblank-update-for-r600.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/radeon-fix-crtc-vblank-update-for-r600.patch	Tue Dec 22 01:29:59 2009	(r14804)
@@ -0,0 +1,46 @@
+From: Dave Airlie <airlied at gmail.com>
+To: stable at kernel.org
+Cc: linux-kernel at vger.kernel.org, dri-devel at lists.sf.net, Dave Airlie <airlied at redhat.com>
+Subject: [PATCH] stable - drm/radeon/kms: fix crtc vblank update for r600
+Date: Mon, 21 Dec 2009 14:33:52 +1000
+
+From: Dave Airlie <airlied at redhat.com>
+
+In 2.6.32.2 r600 had no IRQ support, however the patch in
+500b758725314ab1b5316eb0caa5b0fa26740e6b to fix vblanks on avivo
+cards, needs irqs.
+
+So check for an R600 card and avoid this path if so.
+
+This is a stable only patch for 2.6.32.2 as 2.6.33 has IRQs for r600.
+
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/radeon/atombios_crtc.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c
+index c6777cb..19f93f2 100644
+--- a/drivers/gpu/drm/radeon/atombios_crtc.c
++++ b/drivers/gpu/drm/radeon/atombios_crtc.c
+@@ -249,13 +249,15 @@ void atombios_crtc_dpms(struct drm_crtc *crtc, int mode)
+ 		if (ASIC_IS_DCE3(rdev))
+ 			atombios_enable_crtc_memreq(crtc, 1);
+ 		atombios_blank_crtc(crtc, 0);
+-		drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
++		if (rdev->family < CHIP_R600)
++			drm_vblank_post_modeset(dev, radeon_crtc->crtc_id);
+ 		radeon_crtc_load_lut(crtc);
+ 		break;
+ 	case DRM_MODE_DPMS_STANDBY:
+ 	case DRM_MODE_DPMS_SUSPEND:
+ 	case DRM_MODE_DPMS_OFF:
+-		drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
++		if (rdev->family < CHIP_R600)
++			drm_vblank_pre_modeset(dev, radeon_crtc->crtc_id);
+ 		atombios_blank_crtc(crtc, 1);
+ 		if (ASIC_IS_DCE3(rdev))
+ 			atombios_enable_crtc_memreq(crtc, 0);
+-- 
+1.6.5.2
+

Modified: dists/trunk/linux-2.6/debian/patches/series/3
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/3	Mon Dec 21 01:37:24 2009	(r14803)
+++ dists/trunk/linux-2.6/debian/patches/series/3	Tue Dec 22 01:29:59 2009	(r14804)
@@ -10,3 +10,4 @@
 - features/all/r8169-rtl8168d-1-2-request_firmware.patch
 - features/all/r8169-init-phy-return-error.patch
 + features/all/r8169-rtl8168d-1-2-request_firmware-2.patch
++ bugfix/all/radeon-fix-crtc-vblank-update-for-r600.patch