drm/i915/selftests: Prepare object blit tests for obj->mm.lock removal.

Use some unlocked versions where we're not holding the ww lock.

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-50-maarten.lankhorst@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
index 23b6e11..ee9496f 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
@@ -262,7 +262,7 @@ static int igt_fill_blt_thread(void *arg)
                        goto err_flush;
                }
 
-               vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
+               vaddr = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
                if (IS_ERR(vaddr)) {
                        err = PTR_ERR(vaddr);
                        goto err_put;
@@ -380,7 +380,7 @@ static int igt_copy_blt_thread(void *arg)
                        goto err_flush;
                }
 
-               vaddr = i915_gem_object_pin_map(src, I915_MAP_WB);
+               vaddr = i915_gem_object_pin_map_unlocked(src, I915_MAP_WB);
                if (IS_ERR(vaddr)) {
                        err = PTR_ERR(vaddr);
                        goto err_put_src;
@@ -400,7 +400,7 @@ static int igt_copy_blt_thread(void *arg)
                        goto err_put_src;
                }
 
-               vaddr = i915_gem_object_pin_map(dst, I915_MAP_WB);
+               vaddr = i915_gem_object_pin_map_unlocked(dst, I915_MAP_WB);
                if (IS_ERR(vaddr)) {
                        err = PTR_ERR(vaddr);
                        goto err_put_dst;