drm/vblank: Use spin_(un)lock_irq() in drm_queue_vblank_event()
authorLyude Paul <lyude@redhat.com>
Mon, 20 Jul 2020 19:07:35 +0000 (15:07 -0400)
committerLyude Paul <lyude@redhat.com>
Tue, 21 Jul 2020 15:08:04 +0000 (11:08 -0400)
This one's easy - we're already calling kzalloc(GFP_KERNEL) in this
function, so we must already be guaranteed to have IRQs enabled when
calling this. So, use the plain _irq() variants of spin_(un)lock() to
make this more obvious.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200720190736.180297-5-lyude@redhat.com
drivers/gpu/drm/drm_vblank.c

index 51f2e98..6461007 100644 (file)
@@ -1611,7 +1611,6 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
        struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
        struct drm_pending_vblank_event *e;
        ktime_t now;
-       unsigned long flags;
        u64 seq;
        int ret;
 
@@ -1633,7 +1632,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
                        e->event.vbl.crtc_id = crtc->base.id;
        }
 
-       spin_lock_irqsave(&dev->event_lock, flags);
+       spin_lock_irq(&dev->event_lock);
 
        /*
         * drm_crtc_vblank_off() might have been called after we called
@@ -1670,12 +1669,12 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
                vblwait->reply.sequence = req_seq;
        }
 
-       spin_unlock_irqrestore(&dev->event_lock, flags);
+       spin_unlock_irq(&dev->event_lock);
 
        return 0;
 
 err_unlock:
-       spin_unlock_irqrestore(&dev->event_lock, flags);
+       spin_unlock_irq(&dev->event_lock);
        kfree(e);
 err_put:
        drm_vblank_put(dev, pipe);