lkml.org 
[lkml]   [2013]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/75] drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
    Date
    3.8.13.6 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Xiong Zhang <xiong.y.zhang@intel.com>

    commit 067556084a0e412013af6b0250a3143ae5afde6d upstream.

    obj->mm_list link to dev_priv->mm.inactive_list/active_list
    obj->global_list link to dev_priv->mm.unbound_list/bound_list

    This regression has been introduced in

    commit 93927ca52a55c23e0a6a305e7e9082e8411ac9fa
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date: Thu Jan 10 18:03:00 2013 +0100

    drm/i915: Revert shrinker changes from "Track unbound pages"

    Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
    [danvet: Add regression notice.]
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    [ kamal: backport to 3.8 ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/i915/i915_gem.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
    index 80bc298..0e01617 100644
    --- a/drivers/gpu/drm/i915/i915_gem.c
    +++ b/drivers/gpu/drm/i915/i915_gem.c
    @@ -4429,7 +4429,7 @@ i915_gem_inactive_shrink(struct shrinker *shrinker, struct shrink_control *sc)
    list_for_each_entry(obj, &dev_priv->mm.unbound_list, gtt_list)
    if (obj->pages_pin_count == 0)
    cnt += obj->base.size >> PAGE_SHIFT;
    - list_for_each_entry(obj, &dev_priv->mm.inactive_list, gtt_list)
    + list_for_each_entry(obj, &dev_priv->mm.inactive_list, mm_list)
    if (obj->pin_count == 0 && obj->pages_pin_count == 0)
    cnt += obj->base.size >> PAGE_SHIFT;

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-30 18:01    [W:3.221 / U:0.984 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site