Just a bit of organization and comment. In the past we had two functions psr_exit and psr_do_exit. psr_exit is the propper name now. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_dp.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 774eb6c..ac70b3a 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -2388,7 +2388,14 @@ unlock: mutex_unlock(&dev_priv->psr.lock); } -static void intel_edp_psr_do_exit(struct drm_device *dev) +/** + * intel_edp_is_psr_exit + * @dev: DRM device + * + * This function immediately inactivate PSR. In other words it forces a + * transition from PSR Entry state to PSR Exit/Inactive. + */ +static void intel_edp_psr_exit(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -2420,7 +2427,7 @@ void intel_edp_psr_invalidate(struct drm_device *dev, crtc = dp_to_dig_port(dev_priv->psr.enabled)->base.base.crtc; pipe = to_intel_crtc(crtc)->pipe; - intel_edp_psr_do_exit(dev); + intel_edp_psr_exit(dev); frontbuffer_bits &= INTEL_FRONTBUFFER_ALL_MASK(pipe); @@ -2453,7 +2460,7 @@ void intel_edp_psr_flush(struct drm_device *dev, */ if (IS_HASWELL(dev) && (frontbuffer_bits & INTEL_FRONTBUFFER_SPRITE(pipe))) - intel_edp_psr_do_exit(dev); + intel_edp_psr_exit(dev); if (!dev_priv->psr.active && !dev_priv->psr.busy_frontbuffer_bits) schedule_delayed_work(&dev_priv->psr.work, -- 1.9.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx