lkml.org 
[lkml]   [2010]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[27/59] drm/i915: fix hibernation since i915 self-reclaim fixes
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

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

    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@redhat.com>
    Tested-by: M. Vefa Bicakci <bicave@superonline.com>
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/i915/i915_gem.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/gpu/drm/i915/i915_gem.c
    +++ b/drivers/gpu/drm/i915/i915_gem.c
    @@ -2262,7 +2262,7 @@ i915_gem_object_get_pages(struct drm_gem
    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))



    \
     
     \ /
      Last update: 2010-08-25 00:57    [W:0.024 / U:34.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site