[PATCH] Revert "drm/i915: Dirty hack to fix selftests locking inversion"
Andi Shyti
andi.shyti at linux.intel.com
Tue Aug 5 18:39:50 UTC 2025
This reverts commit dd878c0cec75530ca3ffdb6c759f798eb91cc1df.
---
drivers/gpu/drm/i915/gt/intel_context.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index b1b8695ba7c9..238e34098162 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -529,18 +529,6 @@ struct i915_request *intel_context_create_request(struct intel_context *ce)
i915_gem_ww_ctx_fini(&ww);
- if (IS_ERR(rq))
- return rq;
-
- /*
- * timeline->mutex should be the inner lock, but is used as outer lock.
- * Hack around this to shut up lockdep in selftests..
- */
- lockdep_unpin_lock(&ce->timeline->mutex, rq->cookie);
- mutex_release(&ce->timeline->mutex.dep_map, _RET_IP_);
- mutex_acquire(&ce->timeline->mutex.dep_map, SINGLE_DEPTH_NESTING, 0, _RET_IP_);
- rq->cookie = lockdep_pin_lock(&ce->timeline->mutex);
-
return rq;
}
--
2.47.2
More information about the Intel-gfx-trybot
mailing list