Commit 17b7ab92 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

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



Convert a few calls to use the 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-53-maarten.lankhorst@linux.intel.com
parent d3ad2956

drivers/gpu/drm/i915/gt/selftest_hangcheck.c

+4 −4
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ 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,

	vaddr = i915_gem_object_pin_map_unlocked(h->obj,

						 i915_coherent_map_type(gt->i915));

	if (IS_ERR(vaddr)) {

		err = PTR_ERR(vaddr);
@@ -149,7 +149,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);