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

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 10:28:14 2010
New Revision: 16716

Log:
add radeon 2.6.35.10 hang fix

trivially ported by fixing comment diff.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.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	Mon Dec 20 09:33:57 2010	(r16715)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:14 2010	(r16716)
@@ -17,6 +17,7 @@
   * [openvz] Reenable NF_CONNTRACK_IPV6.
   * cifs: fix another memleak, in cifs_root_iget.
   * b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmd.
+  * drm/radeon/kms: MC vram map needs to be >= pci aperture size.
 
  -- 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-mc-vram-map-needs-to-be-pci-aperture-size.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-mc-vram-map-needs-to-be-pci-aperture-size.patch	Mon Dec 20 10:28:14 2010	(r16716)
@@ -0,0 +1,40 @@
+From b7d8cce5b558e0c0aa6898c9865356481598b46d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon, 25 Oct 2010 19:44:00 -0400
+Subject: drm/radeon/kms: MC vram map needs to be >= pci aperture size
+
+From: Alex Deucher <alexdeucher at gmail.com>
+
+commit b7d8cce5b558e0c0aa6898c9865356481598b46d upstream.
+
+The vram map in the radeon memory controller needs to be
+>= the pci aperture size.  Fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=28402
+
+The problematic cards in the above bug have 64 MB of vram,
+but the pci aperture is 128 MB and the MC vram map was only
+64 MB.  This can lead to hangs.
+
+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>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+
+---
+ drivers/gpu/drm/radeon/r100.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: linux/drivers/gpu/drm/radeon/r100.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/radeon/r100.c
++++ linux/drivers/gpu/drm/radeon/r100.c
+@@ -2321,6 +2321,9 @@ void r100_vram_init_sizes(struct radeon_
+ 		rdev->mc.vram_location = 0xFFFFFFFFUL;
+ 		 /* Fix for RN50, M6, M7 with 8/16/32(??) MBs of VRAM - 
+ 		  * Novell bug 204882 + along with lots of ubuntu ones */
++		if (rdev->mc.aper_size > config_aper_size)
++			config_aper_size = rdev->mc.aper_size;
++
+ 		if (config_aper_size > rdev->mc.real_vram_size)
+ 			rdev->mc.mc_vram_size = config_aper_size;
+ 		else

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 09:33:57 2010	(r16715)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:14 2010	(r16716)
@@ -5,3 +5,4 @@
 + bugfix/all/tehuti-Firmware-filename-is-tehuti-bdx.bin.patch
 + bugfix/all/cifs-fix-another-memleak-in-cifs_root_iget.patch
 + bugfix/all/b43-fix-warning-at-drivers-mmc-core-core.c-237-in-mmc_wait_for_cmd.patch
++ bugfix/all/drm-radeon-kms-mc-vram-map-needs-to-be-pci-aperture-size.patch