drm/i915: Use local pipe_config varariable when available
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Thu, 15 Jan 2015 12:55:24 +0000 (14:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 27 Jan 2015 08:50:50 +0000 (09:50 +0100)
In functions 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@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 4db114f6ba42286e10b27744d0df7c13f9c64091..d28f1902c27761aa0cab53b39807e9dce4cf055e 100644 (file)
@@ -4605,7 +4605,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;
 
        /*
@@ -5928,7 +5928,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) {
                /* Use SSC source */
                if (pipe == PIPE_A)
                        vlv_dpio_write(dev_priv, pipe, VLV_PLL_DW5(pipe),
@@ -7544,7 +7544,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)
                intel_pch_transcoder_get_m_n(crtc, &pipe_config->dp_m_n);
        else
                intel_cpu_transcoder_get_m_n(crtc, pipe_config->cpu_transcoder,