[PATCH 43/49] lockdep-hax

Chris Wilson chris at chris-wilson.co.uk
Wed Oct 3 14:16:22 UTC 2018


---
 drivers/gpu/drm/i915/i915_sw_fence.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index bba1f1bef863..9600f1cb7324 100644
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -148,7 +148,7 @@ static void __i915_sw_fence_wake_up_all(struct i915_sw_fence *fence,
 	 * (and so added to the list to be woken).
 	 */
 
-	spin_lock_irqsave_nested(&x->lock, flags, 1 + !!continuation);
+	spin_lock_irqsave(&x->lock, flags);
 	if (continuation) {
 		list_for_each_entry_safe(pos, next, &x->head, entry) {
 			if (pos->func == autoremove_wake_function)
@@ -221,6 +221,8 @@ void __i915_sw_fence_init(struct i915_sw_fence *fence,
 	debug_fence_init(fence);
 
 	__init_waitqueue_head(&fence->wait, name, key);
+	lockdep_set_novalidate_class(&fence->wait.lock);
+
 	atomic_set(&fence->pending, 1);
 	fence->flags = (unsigned long)fn;
 }
-- 
2.19.0



More information about the Intel-gfx-trybot mailing list