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

[Maximilian Attems]

Author: maks
Date: Wed Dec 22 20:43:50 2010
New Revision: 16733

Log:
drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP

fix applies directly from 2.6.36 stable queue

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-don-t-apply-7xx-hdp-flush-workaround-on-agp.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Dec 22 07:57:43 2010	(r16732)
+++ dists/sid/linux-2.6/debian/changelog	Wed Dec 22 20:43:50 2010	(r16733)
@@ -29,6 +29,7 @@
   * drm/radeon/kms: fix interlaced and doublescan handling.
   * drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable.
   * wireless: b43: fix error path in SDIO.
+  * drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-don-t-apply-7xx-hdp-flush-workaround-on-agp.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-don-t-apply-7xx-hdp-flush-workaround-on-agp.patch	Wed Dec 22 20:43:50 2010	(r16733)
@@ -0,0 +1,58 @@
+From f3886f85cfde578f1d0ba6e40ac5f9d70043923b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed, 8 Dec 2010 10:05:34 -0500
+Subject: drm/radeon/kms: don't apply 7xx HDP flush workaround on AGP
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit f3886f85cfde578f1d0ba6e40ac5f9d70043923b upstream.
+
+It should be required for all 7xx asics, but seems to cause
+problems on some AGP 7xx chips.
+
+Fixes:
+https://bugzilla.kernel.org/show_bug.cgi?id=19002
+
+Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
+Reported-and-Tested-by: Duncan <1i5t5.duncan at cox.net>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/radeon/r600.c |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/radeon/r600.c
++++ b/drivers/gpu/drm/radeon/r600.c
+@@ -878,12 +878,15 @@ void r600_pcie_gart_tlb_flush(struct rad
+ 	u32 tmp;
+ 
+ 	/* flush hdp cache so updates hit vram */
+-	if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740)) {
++	if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740) &&
++	    !(rdev->flags & RADEON_IS_AGP)) {
+ 		void __iomem *ptr = (void *)rdev->gart.table.vram.ptr;
+ 		u32 tmp;
+ 
+ 		/* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
+ 		 * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
++		 * This seems to cause problems on some AGP cards. Just use the old
++		 * method for them.
+ 		 */
+ 		WREG32(HDP_DEBUG1, 0);
+ 		tmp = readl((void __iomem *)ptr);
+@@ -3525,10 +3528,12 @@ int r600_debugfs_mc_info_init(struct rad
+ void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo)
+ {
+ 	/* r7xx hw bug.  write to HDP_DEBUG1 followed by fb read
+-	 * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL
++	 * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL.
++	 * This seems to cause problems on some AGP cards. Just use the old
++	 * method for them.
+ 	 */
+ 	if ((rdev->family >= CHIP_RV770) && (rdev->family <= CHIP_RV740) &&
+-	    rdev->vram_scratch.ptr) {
++	    rdev->vram_scratch.ptr && !(rdev->flags & RADEON_IS_AGP)) {
+ 		void __iomem *ptr = (void *)rdev->vram_scratch.ptr;
+ 		u32 tmp;
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Wed Dec 22 07:57:43 2010	(r16732)
+++ dists/sid/linux-2.6/debian/patches/series/30	Wed Dec 22 20:43:50 2010	(r16733)
@@ -17,3 +17,4 @@
 + bugfix/all/drm-i915-sdvo-always-add-a-30ms-delay-to-make-sdvo-tv-detection-reliable.patch
 + bugfix/all/wireless-b43-fix-error-path-in-sdio.patch
 + bugfix/all/iwlwifi-reduce-memory-allocation.patch
++ bugfix/all/drm-radeon-kms-don-t-apply-7xx-hdp-flush-workaround-on-agp.patch