rpms/kernel/F-12 drm-radeon-fix-hang-on-suspend.patch, NONE, 1.1 kernel.spec, 1.1980, 1.1981

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11097

Modified Files:
	kernel.spec 
Added Files:
	drm-radeon-fix-hang-on-suspend.patch 
Log Message:
* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-21
- fix regression in radeon s/r - hangs on suspend


drm-radeon-fix-hang-on-suspend.patch:
 radeon_ttm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE drm-radeon-fix-hang-on-suspend.patch ---
>From 09ab1ce6ec91430246e7071238d6e0e537263acf Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Wed, 13 Jan 2010 09:21:49 +1000
Subject: [PATCH] drm/radeon/kms: only evict to GTT if CP is ready

really we should be testing gart.ready but that isn't set correctly on suspend
so this hack shoudl be worth testing the theory for now.
---
 drivers/gpu/drm/radeon/radeon_ttm.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index a004507..db820ae 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -215,7 +215,10 @@ static void radeon_evict_flags(struct ttm_buffer_object *bo,
 	rbo = container_of(bo, struct radeon_bo, tbo);
 	switch (bo->mem.mem_type) {
 	case TTM_PL_VRAM:
-		radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
+		if (rbo->rdev->cp.ready == false)
+			radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_CPU);
+		else
+			radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_GTT);
 		break;
 	case TTM_PL_TT:
 	default:
-- 
1.6.5.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1980
retrieving revision 1.1981
diff -u -p -r1.1980 -r1.1981
--- kernel.spec	13 Jan 2010 03:19:50 -0000	1.1980
+++ kernel.spec	13 Jan 2010 03:26:19 -0000	1.1981
@@ -689,8 +689,7 @@ Patch1552: linux-2.6-userspace_kvmclock_
 Patch1700: linux-2.6-x86-64-fbdev-primary.patch
 # nouveau + drm fixes
 Patch1810: drm-upgrayedd.patch
-#Patch1811: drm-radeon-fixes.patch
-#Patch1812: drm-radeon-dp-support.patch
+Patch1811: drm-radeon-fix-hang-on-suspend.patch
 Patch1813: drm-radeon-pm.patch
 #Patch1814: drm-nouveau.patch
 Patch1818: drm-i915-resume-force-mode.patch
@@ -1332,6 +1331,7 @@ ApplyPatch linux-2.6-e1000-ich9.patch
 ApplyPatch linux-2.6-x86-64-fbdev-primary.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-upgrayedd.patch
+ApplyPatch drm-radeon-fix-hang-on-suspend.patch
 #ApplyPatch drm-intel-big-hammer.patch
 #ApplyPatch drm-intel-no-tv-hotplug.patch
 ApplyOptionalPatch drm-intel-next.patch
@@ -2018,6 +2018,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-21
+- fix regression in radeon s/r - hangs on suspend
+
 * Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-20
 - force depend ati firmware, better safe than sorry. I don't
   think dracut and dracut kernel are what I wanted to do.