Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97cbc883 authored by Peter Hurley's avatar Peter Hurley Committed by Daniel Vetter
Browse files

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: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 263432b0

drivers/gpu/drm/drm_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

	unsigned long irqflags, irqflags2;

	unsigned long irqflags;

	int ret = 0;



	spin_lock_irqsave(&dev->vbl_lock, irqflags);

	/* Going from 0->1 means we have to enable interrupts again */

	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) {

			/* Enable vblank irqs under vblank_time_lock protection.

			 * 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);

			}

		}

		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags2);

		spin_unlock(&dev->vblank_time_lock);

	} else {

		if (!dev->vblank[crtc].enabled) {

			atomic_dec(&dev->vblank[crtc].refcount);