[Intel-gfx] [PATCH 4/8] drm/i915: Use local pipe_config varariable when available

[Matt Roper]

On Thu, Dec 11, 2014 at 02:38:07PM +0200, Ander Conselvan de Oliveira wrote:
> In function that define a local pipe_config variable to point to
> crtc->config, replace remaining references to crtc->config with
> the local variable. This makes the code more consistent and easier
> to change in an automated manner.
> 
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 3bceacb..da5af23 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4602,7 +4602,7 @@ static void i9xx_pfit_enable(struct intel_crtc *crtc)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct intel_crtc_state *pipe_config = &crtc->config;
>  
> -	if (!crtc->config.gmch_pfit.control)
> +	if (!pipe_config->gmch_pfit.control)
>  		return;
>  
>  	/*
> @@ -5925,7 +5925,7 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
>  		vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW10(pipe),
>  				 0x00d0000f);
>  
> -	if (crtc->config.has_dp_encoder) {
> +	if (pipe_config->has_dp_encoder) {

Does this one change the behavior in some cases?  The pipe_config
parameter passed to this function from vlv_force_pll_on() is a hardcoded
pipe_config that is never going to have has_dp_encoder set, regardless
of what the current config is.


>  		/* Use SSC source */
>  		if (pipe == PIPE_A)
>  			vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
> @@ -7541,7 +7541,7 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,
>  void intel_dp_get_m_n(struct intel_crtc *crtc,
>  		      struct intel_crtc_state *pipe_config)
>  {
> -	if (crtc->config.has_pch_encoder)
> +	if (pipe_config->has_pch_encoder)

I think this one might also change the semantics?  The callchain

   check_crtc_state() -> intel_{dp,ddi}_get_config() -> intel_dp_get_m_n()

passes down a fresh pipe_config() that isn't the same structure stored
in crtc->config (although it hopefully has the same values in the end).


Matt

>  		intel_pch_transcoder_get_m_n(crtc, &pipe_config->dp_m_n);
>  	else
>  		intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,
> -- 
> 1.9.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795