This function is only ever called from ioctl context, so we're
guaranteed to have interrupts enabled. Stop using the irqsave/irqrestore
variants of spin_(un)lock_irq() to make this more obvious.

Signed-off-by: Lyude Paul <ly...@redhat.com>
Cc: Daniel Vetter <dan...@ffwll.ch>
---
 drivers/gpu/drm/drm_vblank.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index 9891e82939e35..51f2e988205e7 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -1551,7 +1551,6 @@ static void drm_legacy_vblank_post_modeset(struct 
drm_device *dev,
                                           unsigned int pipe)
 {
        struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
-       unsigned long irqflags;
 
        /* vblank is not initialized (IRQ not installed ?), or has been freed */
        if (!drm_dev_has_vblank(dev))
@@ -1561,9 +1560,9 @@ static void drm_legacy_vblank_post_modeset(struct 
drm_device *dev,
                return;
 
        if (vblank->inmodeset) {
-               spin_lock_irqsave(&dev->vbl_lock, irqflags);
+               spin_lock_irq(&dev->vbl_lock);
                drm_reset_vblank_timestamp(dev, pipe);
-               spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+               spin_unlock_irq(&dev->vbl_lock);
 
                if (vblank->inmodeset & 0x2)
                        drm_vblank_put(dev, pipe);
-- 
2.26.2

Reply via email to