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

Commit 812e7465 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Have the vblank counter account for the time between vblank irq disable and drm_vblank_off() 



If the vblank irq has already been disabled (via the disable timer) when
we call drm_vblank_off() sample the counter and timestamp one last time.
This will make the sure that the user space visible counter will account
for time between vblank irq disable and drm_vblank_off().

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 13b030af

drivers/gpu/drm/drm_irq.c

+13 −0
Original line number Diff line number Diff line
@@ -140,6 +140,19 @@ static void vblank_disable_and_save(struct drm_device *dev, int crtc) 
	 */

	spin_lock_irqsave(&dev->vblank_time_lock, irqflags);



	/*

	 * If the vblank interrupt was already disbled update the count

	 * and timestamp to maintain the appearance that the counter

	 * has been ticking all along until this time. This makes the

	 * count account for the entire time between drm_vblank_on() and

	 * drm_vblank_off().

	 */

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

		drm_update_vblank_count(dev, crtc);

		spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags);

		return;

	}



	dev->driver->disable_vblank(dev, crtc);

	dev->vblank[crtc].enabled = false;