Commit 2c33b541 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: No need to save/restore irq status in __i915_request_irq_complete

It is always called from thread context.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 181df2d4
...@@ -4075,7 +4075,6 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req) ...@@ -4075,7 +4075,6 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
if (engine->irq_seqno_barrier && if (engine->irq_seqno_barrier &&
test_and_clear_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted)) { test_and_clear_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted)) {
struct intel_breadcrumbs *b = &engine->breadcrumbs; struct intel_breadcrumbs *b = &engine->breadcrumbs;
unsigned long flags;
/* The ordering of irq_posted versus applying the barrier /* The ordering of irq_posted versus applying the barrier
* is crucial. The clearing of the current irq_posted must * is crucial. The clearing of the current irq_posted must
...@@ -4097,7 +4096,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req) ...@@ -4097,7 +4096,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
* the seqno before we believe it coherent since they see * the seqno before we believe it coherent since they see
* irq_posted == false but we are still running). * irq_posted == false but we are still running).
*/ */
spin_lock_irqsave(&b->irq_lock, flags); spin_lock_irq(&b->irq_lock);
if (b->irq_wait && b->irq_wait->tsk != current) if (b->irq_wait && b->irq_wait->tsk != current)
/* Note that if the bottom-half is changed as we /* Note that if the bottom-half is changed as we
* are sending the wake-up, the new bottom-half will * are sending the wake-up, the new bottom-half will
...@@ -4106,7 +4105,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req) ...@@ -4106,7 +4105,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
* ourself. * ourself.
*/ */
wake_up_process(b->irq_wait->tsk); wake_up_process(b->irq_wait->tsk);
spin_unlock_irqrestore(&b->irq_lock, flags); spin_unlock_irq(&b->irq_lock);
if (__i915_gem_request_completed(req, seqno)) if (__i915_gem_request_completed(req, seqno))
return true; return true;
......
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