Commit 042ed2db authored by Chris Wilson's avatar Chris Wilson

drm/i915: Be irqsafe inside reset

As we want to be able to call i915_reset_engine and co from a softirq or
timer context, we need to be irqsafe at all times. So we have to forgo
the simple spin_lock_irq for the full spin_lock_irqsave.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180615093137.14270-1-chris@chris-wilson.co.uk
parent 14921f3c
...@@ -3166,15 +3166,17 @@ i915_gem_reset_request(struct intel_engine_cs *engine, ...@@ -3166,15 +3166,17 @@ i915_gem_reset_request(struct intel_engine_cs *engine,
*/ */
request = i915_gem_find_active_request(engine); request = i915_gem_find_active_request(engine);
if (request) { if (request) {
unsigned long flags;
i915_gem_context_mark_innocent(request->gem_context); i915_gem_context_mark_innocent(request->gem_context);
dma_fence_set_error(&request->fence, -EAGAIN); dma_fence_set_error(&request->fence, -EAGAIN);
/* Rewind the engine to replay the incomplete rq */ /* Rewind the engine to replay the incomplete rq */
spin_lock_irq(&engine->timeline.lock); spin_lock_irqsave(&engine->timeline.lock, flags);
request = list_prev_entry(request, link); request = list_prev_entry(request, link);
if (&request->link == &engine->timeline.requests) if (&request->link == &engine->timeline.requests)
request = NULL; request = NULL;
spin_unlock_irq(&engine->timeline.lock); spin_unlock_irqrestore(&engine->timeline.lock, flags);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment