diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-09-26 16:41:42 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-10-16 12:12:20 +0100 |
commit | 889572692c15b9cf29dcd3267807d400b34cca75 (patch) | |
tree | 0369298053be2e751dbafe979ff85108675c1be0 | |
parent | 0aa71c189bf80c70c5f39dec7869cf9072c0839f (diff) |
lockdep-hax
-rw-r--r-- | drivers/gpu/drm/i915/i915_sw_fence.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |