Skip to contentSkip to conversation

drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

PATCH In review Dave Airlie 4 participants 4 messages Jul 2, 2010 – Oct 20, 2010

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 drm/i915: fix hibernation since 4bdadb9785696439c6e2b3efe34aa76df1149c83

From: Linus Torvalds <[email protected]>

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 <[email protected]>
Tested-by M. Vefa Bicakci <[email protected]>
---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
index 9ded3da..0743858 100644
@@ -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))
Signature · 1 line
1.7.0.1
#1 lore raw
Quoted 6 lines · Dave Airlie

From: Linus Torvalds <[email protected]>

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.

Quoted 7 lines

[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 <[email protected]>
Tested-by M. Vefa Bicakci <[email protected]>

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

thanks,

greg k-h

#2 lore raw
Quoted 2 lines · Greg KH

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

#3 lore raw
In reply to Dave Airlie
Quoted 3 lines · 在 星期五 02 7月 2010 08:04:42，Dave Airlie 写道：

From: Linus Torvalds <[email protected]>

Since 4bdadb9785696439c6e2b3efe34aa76df1149c83, we've

been passing

Quoted 1 line

GFP_MOVABLE where we weren't before caused hibernate on

Intel hardware

Quoted 9 lines

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 <[email protected]>
Tested-by M. Vefa Bicakci <[email protected]>
Quoted 6 lines
---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/i915_gem.c index 9ded3da..0743858

100644

drivers/gpu/drm/i915/i915_gem.c i915_gem_object_get_pages(struct

Quoted 3 lines
drivers/gpu/drm/i915/i915_gem.c +0 -0
@@ -2239,7 +2239,7 @@ i915_gem_object_get_pages(struct

drm_gem_object *obj,

drivers/gpu/drm/i915/i915_gem.c i915_gem_object_get_pages(struct drm_gem_object *obj, · line 2245

Quoted 8 lines
drivers/gpu/drm/i915/i915_gem.c +1 -1
 	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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx