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

Commit 844b03f2 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Don't clear vblank timestamps when vblank interrupt is disabled 



Clearing the timestamps causes us to send zeroed timestamps to userspace
if they get sent out in response to the drm_vblank_off(). It's better
to send the very latest timestamp and count instead.

Testcase: igt/kms_flip/modeset-vs-vblank-race
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 08c71e5e

drivers/gpu/drm/drm_irq.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -55,14 +55,6 @@ 
 */

 */

#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000

#define DRM_REDUNDANT_VBLIRQ_THRESH_NS 1000000





/*

 * Clear vblank timestamp buffer for a crtc.

 */

static void clear_vblank_timestamps(struct drm_device *dev, int crtc)

{

	memset(dev->vblank[crtc].time, 0, sizeof(dev->vblank[crtc].time));

}



/*

/*

 * Disable vblank irq's on crtc, make sure that last vblank count

 * Disable vblank irq's on crtc, make sure that last vblank count

 * of hardware and corresponding consistent software vblank counter

 * of hardware and corresponding consistent software vblank counter
@@ -131,9 +123,6 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) 
		smp_mb__after_atomic();

		smp_mb__after_atomic();

	}

	}





	/* Invalidate all timestamps while vblank irq's are off. */

	clear_vblank_timestamps(dev, crtc);



	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

	spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

}

}