Skip to content

Commit

Permalink
drm/i915/selftests: Prepare object blit tests for obj->mm.lock removal.
Browse files Browse the repository at this point in the history
Use some unlocked versions where we're not holding the ww lock.

Signed-off-by: Maarten Lankhorst <[email protected]>
Reviewed-by: Thomas Hellström <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
  • Loading branch information
mlankhorst authored and danvet committed Mar 24, 2021
1 parent 3027291 commit fa7371c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit fa7371c

Please sign in to comment.