Re: [PATCH 10/15] drm/i915: Convert intel_dsi to use atomic state

[Daniel Vetter <daniel@ffwll.ch>]

On Tue, Aug 09, 2016 at 05:04:09PM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dsi.c | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
> index 1a2e1dcbff1a..8ffa6154e9c6 100644
> --- a/drivers/gpu/drm/i915/intel_dsi.c
> +++ b/drivers/gpu/drm/i915/intel_dsi.c
> @@ -534,16 +534,15 @@ static void intel_dsi_enable(struct intel_encoder *encoder)
>  	intel_panel_enable_backlight(intel_dsi->attached_connector);
>  }
>  
> -static void intel_dsi_prepare(struct intel_encoder *intel_encoder);
> +static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
> +			      struct intel_crtc_state *pipe_config);
>  
>  static void intel_dsi_pre_enable(struct intel_encoder *encoder,
>  				 struct intel_crtc_state *pipe_config,
>  				 struct drm_connector_state *conn_state)
>  {
> -	struct drm_device *dev = encoder->base.dev;
> -	struct drm_i915_private *dev_priv = to_i915(dev);
> +	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);
> -	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
>  	enum port port;
>  
>  	DRM_DEBUG_KMS("\n");
> @@ -553,9 +552,9 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,
>  	 * lock. It needs to be fully powered down to fix it.
>  	 */
>  	intel_disable_dsi_pll(encoder);
> -	intel_enable_dsi_pll(encoder, crtc->config);
> +	intel_enable_dsi_pll(encoder, pipe_config);
>  
> -	intel_dsi_prepare(encoder);
> +	intel_dsi_prepare(encoder, pipe_config);
>  
>  	/* Panel Enable over CRC PMIC */
>  	if (intel_dsi->gpio_panel)
> @@ -829,7 +828,7 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,
>  				crtc_hblank_start_sw, crtc_hblank_end_sw;
>  
>  	intel_crtc = to_intel_crtc(encoder->base.crtc);
> -	adjusted_mode_sw = &intel_crtc->config->base.adjusted_mode;
> +	adjusted_mode_sw = &pipe_config->base.adjusted_mode;

I think this will break bxt dsi state readout. It looks like it's still
broken :( I totally missed the review there I think, it should do this
rounding in compute_config, to guarantee that get_pipe_config matches.

I suggest you just put a FIXME onto this one and drop this hunk from your
patch.

With that addressed:

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

>  
>  	/*
>  	 * Atleast one port is active as encoder->get_config called only if
> @@ -1113,14 +1112,15 @@ static u32 pixel_format_to_reg(enum mipi_dsi_pixel_format fmt)
>  	}
>  }
>  
> -static void intel_dsi_prepare(struct intel_encoder *intel_encoder)
> +static void intel_dsi_prepare(struct intel_encoder *intel_encoder,
> +			      struct intel_crtc_state *pipe_config)
>  {
>  	struct drm_encoder *encoder = &intel_encoder->base;
>  	struct drm_device *dev = encoder->dev;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> -	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
> +	struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->base.crtc);
>  	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);
> -	const struct drm_display_mode *adjusted_mode = &intel_crtc->config->base.adjusted_mode;
> +	const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode;
>  	enum port port;
>  	unsigned int bpp = mipi_dsi_pixel_format_to_bpp(intel_dsi->pixel_format);
>  	u32 val, tmp;
> @@ -1357,7 +1357,7 @@ static int intel_dsi_set_property(struct drm_connector *connector,
>  		intel_connector->panel.fitting_mode = val;
>  	}
>  
> -	crtc = intel_attached_encoder(connector)->base.crtc;
> +	crtc = connector->state->crtc;
>  	if (crtc && crtc->state->enable) {
>  		/*
>  		 * If the CRTC is enabled, the display will be changed
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx