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

Straightforward conversion, just convert a bunch of calls to
unlocked versions.

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/20210128162612.927917-45-maarten.lankhorst@linux.intel.com
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-45-maarten.lankhorst@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index d3f87dc4eda3822dd5fda9816534dd74008c6cf8..5fef592390cb5ceb04d39fae1d8a4a1992d8d122 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -1094,7 +1094,7 @@ __read_slice_count(struct intel_context *ce,
        if (ret < 0)
                return ret;
 
-       buf = i915_gem_object_pin_map(obj, I915_MAP_WB);
+       buf = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
        if (IS_ERR(buf)) {
                ret = PTR_ERR(buf);
                return ret;
@@ -1511,7 +1511,7 @@ static int write_to_scratch(struct i915_gem_context *ctx,
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
+       cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
        if (IS_ERR(cmd)) {
                err = PTR_ERR(cmd);
                goto out;
@@ -1622,7 +1622,7 @@ static int read_from_scratch(struct i915_gem_context *ctx,
                if (err)
                        goto out_vm;
 
-               cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
+               cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
                if (IS_ERR(cmd)) {
                        err = PTR_ERR(cmd);
                        goto out;
@@ -1658,7 +1658,7 @@ static int read_from_scratch(struct i915_gem_context *ctx,
                if (err)
                        goto out_vm;
 
-               cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
+               cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
                if (IS_ERR(cmd)) {
                        err = PTR_ERR(cmd);
                        goto out;
@@ -1715,7 +1715,7 @@ static int read_from_scratch(struct i915_gem_context *ctx,
        if (err)
                goto out_vm;
 
-       cmd = i915_gem_object_pin_map(obj, I915_MAP_WB);
+       cmd = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WB);
        if (IS_ERR(cmd)) {
                err = PTR_ERR(cmd);
                goto out_vm;