[Intel-gfx] [PATCH 08/15] drm/i915: Convert intel_crt to use atomic state

[Daniel Vetter]

On Tue, Aug 09, 2016 at 05:04:07PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

> ---
>  drivers/gpu/drm/i915/intel_crt.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 8fe36d049d2f..1daf2d9c937e 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -143,13 +143,15 @@ static void hsw_crt_get_config(struct intel_encoder *encoder,
>  
>  /* Note: The caller is required to filter out dpms modes not supported by the
>   * platform. */
> -static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
> +static void intel_crt_set_dpms(struct intel_encoder *encoder,
> +			       struct intel_crtc_state *crtc_state,
> +			       int mode)
>  {
>  	struct drm_device *dev = encoder->base.dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>  	struct intel_crt *crt = intel_encoder_to_crt(encoder);
> -	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
> -	const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
> +	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
> +	const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode;
>  	u32 adpa;
>  
>  	if (INTEL_INFO(dev)->gen >= 5)
> @@ -197,7 +199,7 @@ static void intel_disable_crt(struct intel_encoder *encoder,
>  			      struct intel_crtc_state *old_crtc_state,
>  			      struct drm_connector_state *old_conn_state)
>  {
> -	intel_crt_set_dpms(encoder, DRM_MODE_DPMS_OFF);
> +	intel_crt_set_dpms(encoder, old_crtc_state, DRM_MODE_DPMS_OFF);
>  }
>  
>  static void pch_disable_crt(struct intel_encoder *encoder,
> @@ -217,7 +219,7 @@ static void intel_enable_crt(struct intel_encoder *encoder,
>  			     struct intel_crtc_state *pipe_config,
>  			     struct drm_connector_state *conn_state)
>  {
> -	intel_crt_set_dpms(encoder, DRM_MODE_DPMS_ON);
> +	intel_crt_set_dpms(encoder, pipe_config, DRM_MODE_DPMS_ON);
>  }
>  
>  static enum drm_mode_status
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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