| From df1f9168b19ff78f1e4272c506cb4edbce0916fa Mon Sep 17 00:00:00 2001 |
| From: Ben Widawsky <ben@bwidawsk.net> |
| Date: Wed, 31 Jul 2013 17:00:01 -0700 |
| Subject: drm/i915: Rework __i915_gem_shrink |
| |
| In order to do this for all VMs, it's convenient to rework the logic a |
| bit. This should have no functional impact. |
| |
| Signed-off-by: Ben Widawsky <ben@bwidawsk.net> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 80dcfdbd68b094f21f7ce222fb8039123f5b4cbe) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_gem.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c |
| index deb0a0fcf2b4..6fa05c47ea4b 100644 |
| --- a/drivers/gpu/drm/i915/i915_gem.c |
| +++ b/drivers/gpu/drm/i915/i915_gem.c |
| @@ -1694,9 +1694,14 @@ __i915_gem_shrink(struct drm_i915_private *dev_priv, long target, |
| } |
| |
| list_for_each_entry_safe(obj, next, &vm->inactive_list, mm_list) { |
| - if ((i915_gem_object_is_purgeable(obj) || !purgeable_only) && |
| - i915_gem_object_unbind(obj) == 0 && |
| - i915_gem_object_put_pages(obj) == 0) { |
| + |
| + if (!i915_gem_object_is_purgeable(obj) && purgeable_only) |
| + continue; |
| + |
| + if (i915_gem_object_unbind(obj)) |
| + continue; |
| + |
| + if (!i915_gem_object_put_pages(obj)) { |
| count += obj->base.size >> PAGE_SHIFT; |
| if (count >= target) |
| return count; |
| -- |
| 1.8.5.rc3 |
| |
