3.10-stable patches

added patches:
	drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch

diff --git a/queue-3.10/drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch b/queue-3.10/drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch
new file mode 100644 (file)
index 0000000..e6f2c81
--- /dev/null
+++ b/queue-3.10/drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch
@@ -0,0 +1,43 @@
+From 067556084a0e412013af6b0250a3143ae5afde6d Mon Sep 17 00:00:00 2001
+From: Xiong Zhang <xiong.y.zhang@intel.com>
+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@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"
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>
+[danvet: Add regression notice.]
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Zhouping Liu <zliu@redhat.com>
+
+
+---
+ 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;
+ 

diff --git a/queue-3.10/series b/queue-3.10/series
index a06d2178762ccaf750f6dfe9e5e02b26cacec01b..46b74aaa29dd2124d5c29afdcd1c3f0af8f41488 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -95,3 +95,4 @@ radeon-kms-do-not-flush-uninitialized-hotplug-work.patch
 iscsi-target-fix-iscsit_add_reject-usage-for-iser.patch
 iscsi-target-fix-iscsit_sequence_cmd-reject-handling-for-iser.patch
 perf-tools-revert-regression-in-configuration-of-python-support.patch
+drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch