Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / selftest_hangcheck.c

diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
index d6ce407..7469859 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
@@ -61,15 +61,15 @@ static int hang_init(struct hang *h, struct intel_gt *gt)
        }
 
        i915_gem_object_set_cache_coherency(h->hws, I915_CACHE_LLC);
-       vaddr = i915_gem_object_pin_map(h->hws, I915_MAP_WB);
+       vaddr = i915_gem_object_pin_map_unlocked(h->hws, I915_MAP_WB);
        if (IS_ERR(vaddr)) {
                err = PTR_ERR(vaddr);
                goto err_obj;
        }
        h->seqno = memset(vaddr, 0xff, PAGE_SIZE);
 
-       vaddr = i915_gem_object_pin_map(h->obj,
-                                       i915_coherent_map_type(gt->i915));
+       vaddr = i915_gem_object_pin_map_unlocked(h->obj,
+                                                i915_coherent_map_type(gt->i915));
        if (IS_ERR(vaddr)) {
                err = PTR_ERR(vaddr);
                goto err_unpin_hws;
@@ -130,7 +130,7 @@ hang_create_request(struct hang *h, struct intel_engine_cs *engine)
                return ERR_CAST(obj);
        }
 
-       vaddr = i915_gem_object_pin_map(obj, i915_coherent_map_type(gt->i915));
+       vaddr = i915_gem_object_pin_map_unlocked(obj, i915_coherent_map_type(gt->i915));
        if (IS_ERR(vaddr)) {
                i915_gem_object_put(obj);
                i915_vm_put(vm);