drm/i915: Clarify mmio_flip_lock locking
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Sep 2014 12:55:32 +0000 (14:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 19 Sep 2014 12:43:23 +0000 (14:43 +0200)
The ->queue_flip callback is always called from process context, so
plain _irq spinlock variants are enough.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 8b73d1161ae1afba1d7289aefe00ca81389a80a2..5b05ddbfa46fb04a35f23bf149e5cde28e98f02b 100644 (file)
@@ -9792,7 +9792,6 @@ static int intel_queue_mmio_flip(struct drm_device *dev,
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-       unsigned long irq_flags;
        int ret;
 
        if (WARN_ON(intel_crtc->mmio_flip.seqno))
@@ -9806,10 +9805,10 @@ static int intel_queue_mmio_flip(struct drm_device *dev,
                return 0;
        }
 
-       spin_lock_irqsave(&dev_priv->mmio_flip_lock, irq_flags);
+       spin_lock_irq(&dev_priv->mmio_flip_lock);
        intel_crtc->mmio_flip.seqno = obj->last_write_seqno;
        intel_crtc->mmio_flip.ring_id = obj->ring->id;
-       spin_unlock_irqrestore(&dev_priv->mmio_flip_lock, irq_flags);
+       spin_unlock_irq(&dev_priv->mmio_flip_lock);
 
        /*
         * Double check to catch cases where irq fired before