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

Commit dd7c0b66 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: factor out reset_vblank_counter 



We need to do the same for other platforms in upcoming patches.

v2:
- s/p/pipe (Ville)
- Call the new helper with the vbl_lock already held. The part it
  protects is short, so releasing it between pipes only makes proving
  correctness more difficult.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Resolve conflict with Damien's s/p/pipe/ change.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a30180a5

drivers/gpu/drm/i915/intel_pm.c

+8 −1
Original line number Diff line number Diff line
@@ -5310,6 +5310,13 @@ static void hsw_power_well_post_enable(struct drm_i915_private *dev_priv) 
	}

}



static void reset_vblank_counter(struct drm_device *dev, enum pipe pipe)

{

	assert_spin_locked(&dev->vbl_lock);



	dev->vblank[pipe].last = 0;

}



static void hsw_power_well_post_disable(struct drm_i915_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;
@@ -5326,7 +5333,7 @@ static void hsw_power_well_post_disable(struct drm_i915_private *dev_priv) 
	spin_lock_irqsave(&dev->vbl_lock, irqflags);

	for_each_pipe(pipe)

		if (pipe != PIPE_A)

			dev->vblank[pipe].last = 0;

			reset_vblank_counter(dev, pipe);

	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);

}