Commit 9aa6de99 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

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



Use unlocked versions when the ww lock is not held.

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-56-maarten.lankhorst@linux.intel.com
parent e20e9b15

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct i915_vma *create_wally(struct intel_engine_cs *engine) 
		return ERR_PTR(err);

	}



	cs = i915_gem_object_pin_map(obj, I915_MAP_WC);

	cs = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);

	if (IS_ERR(cs)) {

		i915_gem_object_put(obj);

		return ERR_CAST(cs);
@@ -212,7 +212,7 @@ static int __live_ctx_switch_wa(struct intel_engine_cs *engine) 
	if (IS_ERR(bb))

		return PTR_ERR(bb);



	result = i915_gem_object_pin_map(bb->obj, I915_MAP_WC);

	result = i915_gem_object_pin_map_unlocked(bb->obj, I915_MAP_WC);

	if (IS_ERR(result)) {

		intel_context_put(bb->private);

		i915_vma_unpin_and_release(&bb, 0);