rpms/kernel/F-13 drm-i915-fix-hibernate-memory-corruption.patch, 1.1, 1.2 drm-intel-945gm-stability-fixes.patch, 1.1, 1.2

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	drm-i915-fix-hibernate-memory-corruption.patch 
	drm-intel-945gm-stability-fixes.patch 
Log Message:
match up some i915 patches with upstream

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

Index: drm-i915-fix-hibernate-memory-corruption.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/drm-i915-fix-hibernate-memory-corruption.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-i915-fix-hibernate-memory-corruption.patch	2 Jul 2010 00:28:29 -0000	1.1
+++ drm-i915-fix-hibernate-memory-corruption.patch	23 Jul 2010 21:06:19 -0000	1.2
@@ -1,22 +1,30 @@
-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
+Date: Fri, 2 Jul 2010 00:04:42 +0000 (+1000)
+Subject: drm/i915: fix hibernation since i915 self-reclaim fixes
+X-Git-Tag: v2.6.35-rc4~13
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=985b823b919273fe1327d56d2196b4f92e5d0fae
+
+drm/i915: fix hibernation since i915 self-reclaim fixes
+
+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.
 
-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.
+This caused hibernate on Intel hardware to result in a lot of memory
+corruptions on resume.  See for example
 
-[airlied: linus please enhance commit msg if you commit this]
-
-http://bugzilla.kernel.org/show_bug.cgi?id=13811
+  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
@@ -31,6 +39,3 @@ index 9ded3da..0743858 100644
  					   __GFP_COLD |
  					   gfpmask);
  		if (IS_ERR(page))
--- 
-1.7.0.1
-

drm-intel-945gm-stability-fixes.patch:
 i915_gem.c |   10 +++++++++
 i915_reg.h |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 1 deletion(-)

Index: drm-intel-945gm-stability-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/drm-intel-945gm-stability-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- drm-intel-945gm-stability-fixes.patch	21 Jul 2010 00:59:14 -0000	1.1
+++ drm-intel-945gm-stability-fixes.patch	23 Jul 2010 21:06:20 -0000	1.2
@@ -1,3 +1,6 @@
+upstream commit 944001201ca0196bcdb088129e5866a9f379d08c
+(plus some defines)
+
 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
 index 0d05c6f..b87f65d 100644
 --- a/drivers/gpu/drm/i915/i915_gem.c