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

[Ben Hutchings]

Author: benh
Date: Sat Jul 10 15:40:48 2010
New Revision: 15971

Log:
drm/i915: Fix memory corruption on resume from hibernation (Closes: #534422)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-i915-fix-hibernation-since-i915-self-reclaim-fix.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/17

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Jul 10 15:14:09 2010	(r15970)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jul 10 15:40:48 2010	(r15971)
@@ -8,6 +8,8 @@
     architectures where perf events are not available (Closes: #588409)
   * linux-tools: Add build-dependency on binutils-dev to enable symbol
     demangling in perf
+  * drm/i915: Fix memory corruption on resume from hibernation
+    (Closes: #534422)
 
  -- maximilian attems <maks at debian.org>  Wed, 07 Jul 2010 12:33:04 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-i915-fix-hibernation-since-i915-self-reclaim-fix.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/drm-i915-fix-hibernation-since-i915-self-reclaim-fix.patch	Sat Jul 10 15:40:48 2010	(r15971)
@@ -0,0 +1,44 @@
+From: Linus Torvalds <torvalds at linux-foundation.org>
+Date: Fri, 2 Jul 2010 10:04:42 +1000
+Subject: [PATCH] drm/i915: fix hibernation since i915 self-reclaim fixes
+
+commit 985b823b919273fe1327d56d2196b4f92e5d0fae upstream.
+
+Since commit 4bdadb9785696439c6e2b3efe34aa76df1149c83 ("drm/i915:
+Selectively enable self-reclaim"), we've been passing GFP_MOVABLE to the
+i915 page allocator where we weren't before due to some over-eager
+removal of the page mapping gfp_flags games the code used to play.
+
+This caused hibernate on Intel hardware to result in a lot of memory
+corruptions on resume.  See for example
+
+  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>
+Cc: stable at kernel.org
+Cc: Chris Wilson <chris at chris-wilson.co.uk>
+Cc: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
+Cc: Hugh Dickins <hugh.dickins at tiscali.co.uk>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ 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.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/17
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/17	Sat Jul 10 15:14:09 2010	(r15970)
+++ dists/sid/linux-2.6/debian/patches/series/17	Sat Jul 10 15:40:48 2010	(r15971)
@@ -8,3 +8,4 @@
 + bugfix/all/perf-Use-default-compiler-mode-by-default.patch
 + bugfix/all/perf-tools-Move-QUIET_STDERR-def-to-before-first-use.patch
 + bugfix/all/perf-tools-Check-if-dev-null-can-be-used-as-the-o-gc.patch
++ bugfix/x86/drm-i915-fix-hibernation-since-i915-self-reclaim-fix.patch