rpms/kernel/F-13 drm-i915-fix-hibernate-memory-corruption.patch, NONE, 1.1 kernel.spec, 1.2076, 1.2077

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13098

Modified Files:
	kernel.spec 
Added Files:
	drm-i915-fix-hibernate-memory-corruption.patch 
Log Message:
* Fri Jul 02 2010 Dave Airlie <airlied at redhat.com> 2.6.33.5-140
- attempt to fix hibernate on Intel GPUs (kernel.org #13811)


drm-i915-fix-hibernate-memory-corruption.patch:
 i915_gem.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE drm-i915-fix-hibernate-memory-corruption.patch ---
>From 0121d50088a9e04f3bbbee14043cd89164bdf4e6 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri, 2 Jul 2010 09:56:19 +1000
Subject: [PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

Since 4bdadb9785696439c6e2b3efe34aa76df1149c83, we've been passing
GFP_MOVABLE where we weren't before caused hibernate on Intel hardware
to results in a lot of memory corruptions on resume.

[airlied: linus please enhance commit msg if you commit this]

http://bugzilla.kernel.org/show_bug.cgi?id=13811

Reported-by: Evengi Golov (in bugzilla)
Signed-off-by: Dave Airlie <airlied at redhat.com>
Tested-by: M. Vefa Bicakci <bicave at superonline.com>
---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9ded3da..0743858 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2239,7 +2239,7 @@ i915_gem_object_get_pages(struct drm_gem_object *obj,
 	mapping = inode->i_mapping;
 	for (i = 0; i < page_count; i++) {
 		page = read_cache_page_gfp(mapping, i,
-					   mapping_gfp_mask (mapping) |
+					   GFP_HIGHUSER |
 					   __GFP_COLD |
 					   gfpmask);
 		if (IS_ERR(page))
-- 
1.7.0.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2076
retrieving revision 1.2077
diff -u -p -r1.2076 -r1.2077
--- kernel.spec	30 Jun 2010 12:59:31 -0000	1.2076
+++ kernel.spec	2 Jul 2010 00:28:29 -0000	1.2077
@@ -750,6 +750,7 @@ Patch1830: drm-intel-sdvo-fix-2.patch
 Patch1840: drm-i915-use-pipe_control-instruction-on-ironlake-and-sandy-bridge.patch
 Patch1841: drm-i915-fix-non-ironlake-965-class-crashes.patch
 Patch1842: drm-i915-fix-edp-panels.patch
+Patch1843: drm-i915-fix-hibernate-memory-corruption.patch
 
 Patch2100: linux-2.6-phylib-autoload.patch
 
@@ -1491,6 +1492,7 @@ ApplyPatch drm-intel-sdvo-fix-2.patch
 ApplyPatch drm-i915-use-pipe_control-instruction-on-ironlake-and-sandy-bridge.patch
 ApplyPatch drm-i915-fix-non-ironlake-965-class-crashes.patch
 ApplyPatch drm-i915-fix-edp-panels.patch
+ApplyPatch drm-i915-fix-hibernate-memory-corruption.patch
 
 ApplyPatch linux-2.6-phylib-autoload.patch
 
@@ -2239,6 +2241,9 @@ fi
 # and build.
 
 %changelog
+* Fri Jul 02 2010 Dave Airlie <airlied at redhat.com> 2.6.33.5-140
+- attempt to fix hibernate on Intel GPUs (kernel.org #13811)
+
 * Wed Jun 30 2010 Kyle McMartin <kyle at redhat.com>
 - Disable MRST here too.