Commit 7f07c35f authored by Lyude Paul's avatar Lyude Paul

drm/vblank: Use spin_(un)lock_irq() in drm_queue_vblank_event()

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: default avatarLyude Paul <lyude@redhat.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200720190736.180297-5-lyude@redhat.com
parent eb2ee0ef
...@@ -1611,7 +1611,6 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe, ...@@ -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_vblank_crtc *vblank = &dev->vblank[pipe];
struct drm_pending_vblank_event *e; struct drm_pending_vblank_event *e;
ktime_t now; ktime_t now;
unsigned long flags;
u64 seq; u64 seq;
int ret; int ret;
...@@ -1633,7 +1632,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe, ...@@ -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; 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 * 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, ...@@ -1670,12 +1669,12 @@ static int drm_queue_vblank_event(struct drm_device *dev, unsigned int pipe,
vblwait->reply.sequence = req_seq; vblwait->reply.sequence = req_seq;
} }
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irq(&dev->event_lock);
return 0; return 0;
err_unlock: err_unlock:
spin_unlock_irqrestore(&dev->event_lock, flags); spin_unlock_irq(&dev->event_lock);
kfree(e); kfree(e);
err_put: err_put:
drm_vblank_put(dev, pipe); drm_vblank_put(dev, pipe);
......
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