| From ddbf1b18e2955eaef330c527bc8bae4143186468 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Sat, 1 Jun 2013 17:16:22 +0200 |
| Subject: drm/i915: Drop some no longer required mode/adjusted_mode parameters |
| |
| We can get at this easily through intel_crtc->config now. |
| |
| v2: Drop more stuff gcc spotted. |
| |
| v3: Drop even more stuff gcc spotted. |
| |
| v4: Yet more ... |
| |
| Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 8a654f3b743d0f645848f5fde5059f31a78260bf) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 24 ++++++++---------------- |
| 1 file changed, 8 insertions(+), 16 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index 6d0f8f6ba4d2..ca0da5e3e5e5 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -4573,7 +4573,6 @@ static void i9xx_update_pll(struct intel_crtc *crtc, |
| } |
| |
| static void i8xx_update_pll(struct intel_crtc *crtc, |
| - struct drm_display_mode *adjusted_mode, |
| intel_clock_t *reduced_clock, |
| int num_connectors) |
| { |
| @@ -4628,14 +4627,15 @@ static void i8xx_update_pll(struct intel_crtc *crtc, |
| I915_WRITE(DPLL(pipe), dpll); |
| } |
| |
| -static void intel_set_pipe_timings(struct intel_crtc *intel_crtc, |
| - struct drm_display_mode *mode, |
| - struct drm_display_mode *adjusted_mode) |
| +static void intel_set_pipe_timings(struct intel_crtc *intel_crtc) |
| { |
| struct drm_device *dev = intel_crtc->base.dev; |
| struct drm_i915_private *dev_priv = dev->dev_private; |
| enum pipe pipe = intel_crtc->pipe; |
| enum transcoder cpu_transcoder = intel_crtc->config.cpu_transcoder; |
| + struct drm_display_mode *adjusted_mode = |
| + &intel_crtc->config.adjusted_mode; |
| + struct drm_display_mode *mode = &intel_crtc->config.requested_mode; |
| uint32_t vsyncshift, crtc_vtotal, crtc_vblank_end; |
| |
| /* We need to be careful not to changed the adjusted mode, for otherwise |
| @@ -4817,8 +4817,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, |
| 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 drm_display_mode *adjusted_mode = |
| - &intel_crtc->config.adjusted_mode; |
| struct drm_display_mode *mode = &intel_crtc->config.requested_mode; |
| int pipe = intel_crtc->pipe; |
| int plane = intel_crtc->plane; |
| @@ -4883,7 +4881,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, |
| } |
| |
| if (IS_GEN2(dev)) |
| - i8xx_update_pll(intel_crtc, adjusted_mode, |
| + i8xx_update_pll(intel_crtc, |
| has_reduced_clock ? &reduced_clock : NULL, |
| num_connectors); |
| else if (IS_VALLEYVIEW(dev)) |
| @@ -4903,7 +4901,7 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, |
| dspcntr |= DISPPLANE_SEL_PIPE_B; |
| } |
| |
| - intel_set_pipe_timings(intel_crtc, mode, adjusted_mode); |
| + intel_set_pipe_timings(intel_crtc); |
| |
| /* pipesrc and dspsize control the size that is scaled from, |
| * which should always be the user's requested size. |
| @@ -5660,9 +5658,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, |
| 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 drm_display_mode *adjusted_mode = |
| - &intel_crtc->config.adjusted_mode; |
| - struct drm_display_mode *mode = &intel_crtc->config.requested_mode; |
| int pipe = intel_crtc->pipe; |
| int plane = intel_crtc->plane; |
| int num_connectors = 0; |
| @@ -5757,7 +5752,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, |
| } |
| } |
| |
| - intel_set_pipe_timings(intel_crtc, mode, adjusted_mode); |
| + intel_set_pipe_timings(intel_crtc); |
| |
| if (intel_crtc->config.has_pch_encoder) { |
| intel_cpu_transcoder_set_m_n(intel_crtc, |
| @@ -5865,9 +5860,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, |
| 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 drm_display_mode *adjusted_mode = |
| - &intel_crtc->config.adjusted_mode; |
| - struct drm_display_mode *mode = &intel_crtc->config.requested_mode; |
| int pipe = intel_crtc->pipe; |
| int plane = intel_crtc->plane; |
| int num_connectors = 0; |
| @@ -5900,7 +5892,7 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, |
| |
| intel_crtc->lowfreq_avail = false; |
| |
| - intel_set_pipe_timings(intel_crtc, mode, adjusted_mode); |
| + intel_set_pipe_timings(intel_crtc); |
| |
| if (intel_crtc->config.has_pch_encoder) { |
| intel_cpu_transcoder_set_m_n(intel_crtc, |
| -- |
| 1.8.5.rc3 |
| |
