Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

[karo-tx-linux.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9ae1e520f48c36ed3eeb8455efaf732e4a1c8fad..ceb47a7ab71352db3b13cf12c8296911e93e40e6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -4087,7 +4087,6 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
        if (engine->irq_seqno_barrier &&
            test_and_clear_bit(ENGINE_IRQ_BREADCRUMB, &engine->irq_posted)) {
                struct intel_breadcrumbs *b = &engine->breadcrumbs;
-               unsigned long flags;
 
                /* The ordering of irq_posted versus applying the barrier
                 * is crucial. The clearing of the current irq_posted must
@@ -4109,7 +4108,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
                 * the seqno before we believe it coherent since they see
                 * 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)
                        /* Note that if the bottom-half is changed as we
                         * are sending the wake-up, the new bottom-half will
@@ -4118,7 +4117,7 @@ __i915_request_irq_complete(const struct drm_i915_gem_request *req)
                         * ourself.
                         */
                        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))
                        return true;