Commit 86f2f8df authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

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

Straightforward conversion, just convert a bunch of calls to
unlocked versions.
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-43-maarten.lankhorst@linux.intel.com
parent 6c12ada0
...@@ -45,7 +45,7 @@ static int __igt_client_fill(struct intel_engine_cs *engine) ...@@ -45,7 +45,7 @@ static int __igt_client_fill(struct intel_engine_cs *engine)
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;
...@@ -157,7 +157,7 @@ static int prepare_blit(const struct tiled_blits *t, ...@@ -157,7 +157,7 @@ static int prepare_blit(const struct tiled_blits *t,
u32 src_pitch, dst_pitch; u32 src_pitch, dst_pitch;
u32 cmd, *cs; u32 cmd, *cs;
cs = i915_gem_object_pin_map(batch, I915_MAP_WC); cs = i915_gem_object_pin_map_unlocked(batch, I915_MAP_WC);
if (IS_ERR(cs)) if (IS_ERR(cs))
return PTR_ERR(cs); return PTR_ERR(cs);
...@@ -377,7 +377,7 @@ static int verify_buffer(const struct tiled_blits *t, ...@@ -377,7 +377,7 @@ static int verify_buffer(const struct tiled_blits *t,
y = i915_prandom_u32_max_state(t->height, prng); y = i915_prandom_u32_max_state(t->height, prng);
p = y * t->width + x; p = y * t->width + x;
vaddr = i915_gem_object_pin_map(buf->vma->obj, I915_MAP_WC); vaddr = i915_gem_object_pin_map_unlocked(buf->vma->obj, I915_MAP_WC);
if (IS_ERR(vaddr)) if (IS_ERR(vaddr))
return PTR_ERR(vaddr); return PTR_ERR(vaddr);
...@@ -564,7 +564,7 @@ static int tiled_blits_prepare(struct tiled_blits *t, ...@@ -564,7 +564,7 @@ static int tiled_blits_prepare(struct tiled_blits *t,
int err; int err;
int i; int i;
map = i915_gem_object_pin_map(t->scratch.vma->obj, I915_MAP_WC); map = i915_gem_object_pin_map_unlocked(t->scratch.vma->obj, I915_MAP_WC);
if (IS_ERR(map)) if (IS_ERR(map))
return PTR_ERR(map); return PTR_ERR(map);
......
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