drm/i915: Add ww ctx to i915_gem_object_trylock

This is required for i915_gem_evict_vm, to be able to evict the entire VM,
including objects that are already locked to the current ww ctx.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211216142749.1966107-12-maarten.lankhorst@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 66f20b803b01d5440580199fe7cec1ad9eaa2aa8..f66d46882ea7892fb48b5b3f317b75035568bf3c 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -210,9 +210,13 @@ static inline int i915_gem_object_lock_interruptible(struct drm_i915_gem_object
        return __i915_gem_object_lock(obj, ww, true);
 }
 
-static inline bool i915_gem_object_trylock(struct drm_i915_gem_object *obj)
+static inline bool i915_gem_object_trylock(struct drm_i915_gem_object *obj,
+                                          struct i915_gem_ww_ctx *ww)
 {
-       return dma_resv_trylock(obj->base.resv);
+       if (!ww)
+               return dma_resv_trylock(obj->base.resv);
+       else
+               return ww_mutex_trylock(&obj->base.resv->lock, &ww->ctx);
 }
 
 static inline void i915_gem_object_unlock(struct drm_i915_gem_object *obj)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index f893f0bb8d8effcfb39f3aac1f045f2a8bae642c..cc927e49d21f38a5f94be620f8845d480e8a029e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -216,7 +216,7 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,
 
                        /* May arrive from get_pages on another bo */
                        if (!ww) {
-                               if (!i915_gem_object_trylock(obj))
+                               if (!i915_gem_object_trylock(obj, NULL))
                                        goto skip;
                        } else {
                                err = i915_gem_object_lock(obj, ww);
@@ -410,7 +410,7 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
                if (!vma->iomap || i915_vma_is_active(vma))
                        continue;
 
-               if (!i915_gem_object_trylock(obj))
+               if (!i915_gem_object_trylock(obj, NULL))
                        continue;
 
                if (__i915_vma_unbind(vma) == 0)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index ad7a8e9e13e7429b8f4381dd68166ca8dc7fd747..7df50fd6cc7b9a31662ab52a4fdbb71a4f7632f5 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -656,7 +656,7 @@ static int __i915_gem_object_create_stolen(struct intel_memory_region *mem,
        cache_level = HAS_LLC(mem->i915) ? I915_CACHE_LLC : I915_CACHE_NONE;
        i915_gem_object_set_cache_coherency(obj, cache_level);
 
-       if (WARN_ON(!i915_gem_object_trylock(obj)))
+       if (WARN_ON(!i915_gem_object_trylock(obj, NULL)))
                return -EBUSY;
 
        i915_gem_object_init_memory_region(obj, mem);

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
index a8a2ad44b7e3972ad45d065fb28bac2f7c91ec38..b0a4a2dbe3ee9a1493d4047daf6298a7345f802d 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c
@@ -26,7 +26,7 @@ static void dbg_poison_ce(struct intel_context *ce)
                int type = i915_coherent_map_type(ce->engine->i915, obj, true);
                void *map;
 
-               if (!i915_gem_object_trylock(obj))
+               if (!i915_gem_object_trylock(obj, NULL))
                        return;
 
                map = i915_gem_object_pin_map(obj, type);

diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c
index a94b8d56c4bb16d326c28e4e5eb622ce76adaa64..c0637bf799a33a92effbefd4ca11a29d468bb9fd 100644 (file)
--- a/drivers/gpu/drm/i915/gt/mock_engine.c
+++ b/drivers/gpu/drm/i915/gt/mock_engine.c
@@ -17,7 +17,7 @@ static int mock_timeline_pin(struct intel_timeline *tl)
 {
        int err;
 
-       if (WARN_ON(!i915_gem_object_trylock(tl->hwsp_ggtt->obj)))
+       if (WARN_ON(!i915_gem_object_trylock(tl->hwsp_ggtt->obj, NULL)))
                return -EBUSY;
 
        err = intel_timeline_pin_map(tl);

diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c
index f637691b5bcb155d2d74180fb56b721d5c1c33bb..fa4293d2944f1a8e891810f0c885980cdae75960 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
+++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
@@ -465,7 +465,7 @@ create_init_lmem_internal(struct intel_gt *gt, size_t sz, bool try_lmem)
                        return obj;
        }
 
-       i915_gem_object_trylock(obj);
+       i915_gem_object_trylock(obj, NULL);
        err = i915_gem_object_pin_pages(obj);
        if (err) {
                i915_gem_object_unlock(obj);