Commit fa7371c3 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-50-maarten.lankhorst@linux.intel.com
parent 30272919
...@@ -262,7 +262,7 @@ static int igt_fill_blt_thread(void *arg) ...@@ -262,7 +262,7 @@ static int igt_fill_blt_thread(void *arg)
goto err_flush; 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)) { if (IS_ERR(vaddr)) {
err = PTR_ERR(vaddr); err = PTR_ERR(vaddr);
goto err_put; goto err_put;
...@@ -380,7 +380,7 @@ static int igt_copy_blt_thread(void *arg) ...@@ -380,7 +380,7 @@ static int igt_copy_blt_thread(void *arg)
goto err_flush; 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)) { if (IS_ERR(vaddr)) {
err = PTR_ERR(vaddr); err = PTR_ERR(vaddr);
goto err_put_src; goto err_put_src;
...@@ -400,7 +400,7 @@ static int igt_copy_blt_thread(void *arg) ...@@ -400,7 +400,7 @@ static int igt_copy_blt_thread(void *arg)
goto err_put_src; 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)) { if (IS_ERR(vaddr)) {
err = PTR_ERR(vaddr); err = PTR_ERR(vaddr);
goto err_put_dst; goto err_put_dst;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment