drm/i915: Retire before attempting to evict from the active lists

Some object retain an extra pin whilst they are active (e.g. contexts).
This excludes them from being considered for eviction unless we idle the
GPU. If before we look at the active list, we retire beforehand we can
hopefully remove a few excess pins and reduce the amount of searching
required.

v2: Similar principle applies to evict_for_vma

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20161209150555.602-1-chris@chris-wilson.co.uk
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
index fa40100146ea8de65e5a2619d2860e10be301fc3..6457fd0c33a893351dac9eb8d42ceedbe079ada2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/i915_gem_evict.c
@@ -129,7 +129,14 @@ i915_gem_evict_something(struct i915_address_space *vm,
        } else
                drm_mm_init_scan(&vm->mm, min_size, alignment, cache_level);
 
-       if (flags & PIN_NONBLOCK)
+       /* Retire before we search the active list. Although we have
+        * reasonable accuracy in our retirement lists, we may have
+        * a stray pin (preventing eviction) that can only be resolved by
+        * retiring.
+        */
+       if (!(flags & PIN_NONBLOCK))
+               i915_gem_retire_requests(dev_priv);
+       else
                phases[1] = NULL;
 
 search_again:
@@ -235,6 +242,14 @@ int i915_gem_evict_for_vma(struct i915_vma *target, unsigned int flags)
        lockdep_assert_held(&target->vm->i915->drm.struct_mutex);
        trace_i915_gem_evict_vma(target, flags);
 
+       /* Retire before we search the active list. Although we have
+        * reasonable accuracy in our retirement lists, we may have
+        * a stray pin (preventing eviction) that can only be resolved by
+        * retiring.
+        */
+       if (!(flags & PIN_NONBLOCK))
+               i915_gem_retire_requests(target->vm->i915);
+
        check_color = target->vm->mm.color_adjust;
        if (check_color) {
                /* Expand search to cover neighbouring guard pages (or lack!) */