From e75518ce21912e3519ad96631042035f03272c35 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 2 Aug 2013 15:46:21 +0800 Subject: [PATCH] 3.10-stable patches added patches: drm-i915-correct-obj-mm_list-link-to-dev_priv-dev_priv-mm.inactive_list.patch --- ...o-dev_priv-dev_priv-mm.inactive_list.patch | 43 +++++++++++++++++++ queue-3.10/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-3.10/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 index 00000000000..e6f2c81ef4f --- /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 +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 + +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 +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 +[danvet: Add regression notice.] +Signed-off-by: Daniel Vetter +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Zhouping Liu + + +--- + 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 a06d2178762..46b74aaa29d 100644 --- 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 -- 2.47.3