Commit 985b823b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

drm/i915: fix hibernation since i915 self-reclaim fixes

Since commit 4bdadb97 ("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

Reported-by: Evengi Golov (in bugzilla)
Signed-off-by: default avatarDave Airlie <>
Tested-by: default avatarM. Vefa Bicakci <>
Cc: Chris Wilson <>
Cc: KOSAKI Motohiro <>
Cc: Hugh Dickins <>
Signed-off-by: default avatarLinus Torvalds <>
parent 9fbd7f9d
......@@ -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) |
if (IS_ERR(page))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment