drm: Use correct spinlock flavor in drm_vblank_get()
The irq flags state is already established by the outer spin_lock_irqsave(); re-disabling irqs is redundant. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
263432b021
commit
97cbc883d0
|
@ -848,13 +848,13 @@ static void drm_update_vblank_count(struct drm_device *dev, int crtc)
|
||||||
*/
|
*/
|
||||||
int drm_vblank_get(struct drm_device *dev, int crtc)
|
int drm_vblank_get(struct drm_device *dev, int crtc)
|
||||||
{
|
{
|
||||||
unsigned long irqflags, irqflags2;
|
unsigned long irqflags;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
spin_lock_irqsave(&dev->vbl_lock, irqflags);
|
||||||
/* Going from 0->1 means we have to enable interrupts again */
|
/* Going from 0->1 means we have to enable interrupts again */
|
||||||
if (atomic_add_return(1, &dev->vblank[crtc].refcount) == 1) {
|
if (atomic_add_return(1, &dev->vblank[crtc].refcount) == 1) {
|
||||||
spin_lock_irqsave(&dev->vblank_time_lock, irqflags2);
|
spin_lock(&dev->vblank_time_lock);
|
||||||
if (!dev->vblank[crtc].enabled) {
|
if (!dev->vblank[crtc].enabled) {
|
||||||
/* Enable vblank irqs under vblank_time_lock protection.
|
/* Enable vblank irqs under vblank_time_lock protection.
|
||||||
* All vblank count & timestamp updates are held off
|
* All vblank count & timestamp updates are held off
|
||||||
|
@ -872,7 +872,7 @@ int drm_vblank_get(struct drm_device *dev, int crtc)
|
||||||
drm_update_vblank_count(dev, crtc);
|
drm_update_vblank_count(dev, crtc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags2);
|
spin_unlock(&dev->vblank_time_lock);
|
||||||
} else {
|
} else {
|
||||||
if (!dev->vblank[crtc].enabled) {
|
if (!dev->vblank[crtc].enabled) {
|
||||||
atomic_dec(&dev->vblank[crtc].refcount);
|
atomic_dec(&dev->vblank[crtc].refcount);
|
||||||
|
|
Loading…
Reference in a new issue