Skip to content

Commit aa8b70b

Browse files
mlankhorstdanvet
authored andcommitted
drm/i915/selftests: Prepare i915_request tests for obj->mm.lock removal
Straightforward conversion by using unlocked versions. 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]
1 parent 1060974 commit aa8b70b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/gpu/drm/i915/selftests/i915_request.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ static struct i915_vma *empty_batch(struct drm_i915_private *i915)
620620
if (IS_ERR(obj))
621621
return ERR_CAST(obj);
622622

623-
cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
623+
cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
624624
if (IS_ERR(cmd)) {
625625
err = PTR_ERR(cmd);
626626
goto err;
@@ -782,7 +782,7 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915)
782782
if (err)
783783
goto err;
784784

785-
cmd = i915_gem_object_pin_map(obj, I915_MAP_WC);
785+
cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);
786786
if (IS_ERR(cmd)) {
787787
err = PTR_ERR(cmd);
788788
goto err;
@@ -817,7 +817,7 @@ static int recursive_batch_resolve(struct i915_vma *batch)
817817
{
818818
u32 *cmd;
819819

820-
cmd = i915_gem_object_pin_map(batch->obj, I915_MAP_WC);
820+
cmd = i915_gem_object_pin_map_unlocked(batch->obj, I915_MAP_WC);
821821
if (IS_ERR(cmd))
822822
return PTR_ERR(cmd);
823823

@@ -1070,8 +1070,8 @@ static int live_sequential_engines(void *arg)
10701070
if (!request[idx])
10711071
break;
10721072

1073-
cmd = i915_gem_object_pin_map(request[idx]->batch->obj,
1074-
I915_MAP_WC);
1073+
cmd = i915_gem_object_pin_map_unlocked(request[idx]->batch->obj,
1074+
I915_MAP_WC);
10751075
if (!IS_ERR(cmd)) {
10761076
*cmd = MI_BATCH_BUFFER_END;
10771077

0 commit comments

Comments
 (0)