[Intel-gfx] [PATCH v2 19/20] drm/i915: Remove use of runtime pm in atomic commit functions

[Daniel Vetter]

On Tue, Jul 07, 2015 at 09:08:30AM +0200, Maarten Lankhorst wrote:
> This shouldn't be explicitly required here.

Would be good to explain why: We needed this originally for updating
pagetables in plane commit functions. But that's extracted into
prepare/cleanup now. The other issue was running updates when the pipe was
off. That's also now fixed (commit reference for that would be nice if we
have one).
-Daniel

> 
> Suggested-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2eaccdc59a9a..38334fdfc649 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13624,7 +13624,6 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
>  				    struct drm_crtc_state *old_crtc_state)
>  {
>  	struct drm_device *dev = crtc->dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>  	struct intel_crtc_state *old_intel_state =
>  		to_intel_crtc_state(old_crtc_state);
> @@ -13632,8 +13631,6 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
>  	if (intel_crtc->atomic.update_wm_pre)
>  		intel_update_watermarks(crtc);
>  
> -	intel_runtime_pm_get(dev_priv);
> -
>  	/* Perform vblank evasion around commit operation */
>  	if (crtc->state->active)
>  		intel_pipe_update_start(intel_crtc, &intel_crtc->atomic.start_vbl_count);
> @@ -13650,14 +13647,10 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc,
>  static void intel_finish_crtc_commit(struct drm_crtc *crtc,
>  				     struct drm_crtc_state *old_crtc_state)
>  {
> -	struct drm_device *dev = crtc->dev;
> -	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
>  
>  	if (crtc->state->active)
>  		intel_pipe_update_end(intel_crtc, intel_crtc->atomic.start_vbl_count);
> -
> -	intel_runtime_pm_put(dev_priv);
>  }
>  
>  /**
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch