[kernel/f13/master] drm/radeon/kms: MC vram map needs to be >= pci aperture size (#632310)

[Kyle McMartin]

commit de118fdb834ea686e7677148aaae7cf70fa8d227
Author: Kyle McMartin <kyle at redhat.com>
Date:   Thu Dec 9 12:52:01 2010 -0500

    drm/radeon/kms: MC vram map needs to be >= pci aperture size (#632310)

 ...c-vram-map-needs-to-be-gteq-pci-aperature.patch |   32 ++++++++++++++++++++
 kernel.spec                                        |    9 +++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/drm-radeon-kms-mc-vram-map-needs-to-be-gteq-pci-aperature.patch b/drm-radeon-kms-mc-vram-map-needs-to-be-gteq-pci-aperature.patch
new file mode 100644
index 0000000..856b903
--- /dev/null
+++ b/drm-radeon-kms-mc-vram-map-needs-to-be-gteq-pci-aperature.patch
@@ -0,0 +1,32 @@
+commit 93d2725f536c17a85c35051beb4c41b7c1707db0
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date:   Mon Oct 25 19:44:00 2010 -0400
+
+    drm/radeon/kms: MC vram map needs to be >= pci aperture size
+    
+    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>
+    Cc: stable at kernel.org
+    Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
+index a89a15a..a3378ba 100644
+--- a/drivers/gpu/drm/radeon/r100.c
++++ b/drivers/gpu/drm/radeon/r100.c
+@@ -2321,6 +2321,9 @@ void r100_vram_init_sizes(struct radeon_device *rdev)
+ 		/* 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
diff --git a/kernel.spec b/kernel.spec
index 62307ee..700fe34 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 63
+%global baserelease 64
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -719,6 +719,7 @@ Patch1902: agp-intel-use-the-correct-mask-to-detect-i830-aperture-size.patch
 Patch1903: drm-nouveau-pusher-intr.patch
 Patch1904: drm-nouveau-ibdma-race.patch
 # radeon
+Patch1905: drm-radeon-kms-mc-vram-map-needs-to-be-gteq-pci-aperature.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -1474,6 +1475,8 @@ ApplyPatch drm-i915-explosion-following-oom-in-do_execbuffer.patch
 ApplyPatch agp-intel-use-the-correct-mask-to-detect-i830-aperture-size.patch
 
 ApplyPatch drm-radeon-resume-fixes.patch
+# rhbz#632310
+ApplyPatch drm-radeon-kms-mc-vram-map-needs-to-be-gteq-pci-aperature.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # linux1394 git patches
@@ -2286,6 +2289,10 @@ fi
 
 
 %changelog
+* Thu Dec 09 2010 Kyle McMartin <kyle at redhat.com> 2.6.34.7-64
+- Copy fix for (#632310) from F-14:
+  drm/radeon/kms: MC vram map needs to be >= pci aperture size
+
 * Fri Dec 03 2010 Kyle McMartin <kyle at redhat.com> 2.6.34.7-63
 - Enable hpilo.ko on x86_64. (#571329)