This is a note to let you know that I've just added the patch titled
drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 067556084a0e412013af6b0250a3143ae5afde6d Mon Sep 17 00:00:00 2001
From: Xiong Zhang <xiong.y.zhang@xxxxxxxxx>
Date: Fri, 5 Jul 2013 18:53:29 +0800
Subject: drm/i915: Correct obj->mm_list link to dev_priv->dev_priv->mm.inactive_list
From: Xiong Zhang <xiong.y.zhang@xxxxxxxxx>
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@xxxxxxxx>
Date: Thu Jan 10 18:03:00 2013 +0100
drm/i915: Revert shrinker changes from "Track unbound pages"
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Xiong Zhang <xiong.y.zhang@xxxxxxxxx>
[danvet: Add regression notice.]
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Zhouping Liu <zliu@xxxxxxxxxx>
---
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
@@ -4493,7 +4493,7 @@ i915_gem_inactive_shrink(struct shrinker
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;
Patches currently in stable-queue which might be from xiong.y.zhang@xxxxxxxxx are
queue-3.10/drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html