[PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[Dave Airlie]

From: Linus Torvalds <torvalds@linux-foundation.org>

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@redhat.com>
Tested-by: M. Vefa Bicakci <bicave@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

Re: [PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[Greg KH]

On Fri, Jul 02, 2010 at 10:04:42AM +1000, Dave Airlie wrote:
> From: Linus Torvalds <torvalds@linux-foundation.org>
> 
> 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@redhat.com>
> Tested-by: M. Vefa Bicakci <bicave@superonline.com>

This should go into .33 and .34-stable trees, right?

thanks,

greg k-h

Re: [PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[Greg KH]

On Fri, Jul 02, 2010 at 10:04:42AM +1000, Dave Airlie wrote:
> From: Linus Torvalds <torvalds@linux-foundation.org>
> 
> 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@redhat.com>
> Tested-by: M. Vefa Bicakci <bicave@superonline.com>

This should go into .33 and .34-stable trees, right?

thanks,

greg k-h

Re: [PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[Linus Torvalds]

On Thu, Jul 1, 2010 at 5:37 PM, Greg KH <greg@kroah.com> wrote:
>
> This should go into .33 and .34-stable trees, right?

Yup. I added a "cc: stable" to the patch, and it's now commit
985b823b919 in my tree, you'll see it when I push it out along with
the other dri updates.

              Linus

Re: [PATCH] drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

[chiachen]

在 星期五 02 7月 2010 08:04:42，Dave Airlie 写道：
> From: Linus Torvalds <torvalds@linux-foundation.org>
> 
> 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@redhat.com>
> Tested-by: M. Vefa Bicakci <bicave@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))
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx