drm/i915/selftests: Prepare ring submission for obj->mm.lock removal

Use unlocked versions when the ww lock is not held.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-56-maarten.lankhorst@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c
index 3350e7c995bccff92751c8b448f81976d0c6a4c3..99609271c3a791b5f01d81442d5fa696fd84adba 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c
@@ -35,7 +35,7 @@ static struct i915_vma *create_wally(struct intel_engine_cs *engine)
                return ERR_PTR(err);
        }
 
-       cs = i915_gem_object_pin_map(obj, I915_MAP_WC);
+       cs = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);
        if (IS_ERR(cs)) {
                i915_gem_object_put(obj);
                return ERR_CAST(cs);
@@ -212,7 +212,7 @@ static int __live_ctx_switch_wa(struct intel_engine_cs *engine)
        if (IS_ERR(bb))
                return PTR_ERR(bb);
 
-       result = i915_gem_object_pin_map(bb->obj, I915_MAP_WC);
+       result = i915_gem_object_pin_map_unlocked(bb->obj, I915_MAP_WC);
        if (IS_ERR(result)) {
                intel_context_put(bb->private);
                i915_vma_unpin_and_release(&bb, 0);