rpms/kernel/devel drm-i915-fix-hibernate-memory-corruption.patch, NONE, 1.1.2.1 kernel.spec, 1.2037.2.10, 1.2037.2.11

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17422

Modified Files:
      Tag: private-f14-2_6_34
	kernel.spec 
Added Files:
      Tag: private-f14-2_6_34
	drm-i915-fix-hibernate-memory-corruption.patch 
Log Message:
attempt to fix hibernate on Intel GPUs (kernel.org #13811) (RHBZ#537494)

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/devel/kernel.spec,v
retrieving revision 1.2037.2.10
retrieving revision 1.2037.2.11
diff -u -p -r1.2037.2.10 -r1.2037.2.11
--- kernel.spec	7 Jul 2010 04:07:48 -0000	1.2037.2.10
+++ kernel.spec	7 Jul 2010 04:28:49 -0000	1.2037.2.11
@@ -693,6 +693,7 @@ Patch1821: i915-fix-crt-hotplug-regressi
 Patch1824: drm-intel-next.patch
 # make sure the lvds comes back on lid open
 Patch1825: drm-intel-make-lvds-work.patch
+Patch1830: drm-i915-fix-hibernate-memory-corruption.patch
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
 # linux1394 git patches
@@ -1307,6 +1308,7 @@ ApplyPatch drm-nouveau-drm-fixed-header.
 ApplyPatch drm-intel-big-hammer.patch
 ApplyOptionalPatch drm-intel-next.patch
 ApplyPatch drm-intel-make-lvds-work.patch
+ApplyPatch drm-i915-fix-hibernate-memory-corruption.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
 # linux1394 git patches
@@ -1982,6 +1984,9 @@ fi
 
 
 %changelog
+* Wed Jul 07 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-46.2.11
+- attempt to fix hibernate on Intel GPUs (kernel.org #13811) (RHBZ#537494)
+
 * Wed Jul 07 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-46.2.10
 - Let ata_generic handle SATA interface on new MacBook Pro (#608034)