Commit 6ff93609 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: drop adjusted_mode from *_set_pipeconf functions

They can get at the adjusted mode through intel_crtc->config.
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent af13188a
...@@ -5168,8 +5168,7 @@ static int ironlake_get_refclk(struct drm_crtc *crtc) ...@@ -5168,8 +5168,7 @@ static int ironlake_get_refclk(struct drm_crtc *crtc)
return 120000; return 120000;
} }
static void ironlake_set_pipeconf(struct drm_crtc *crtc, static void ironlake_set_pipeconf(struct drm_crtc *crtc)
struct drm_display_mode *adjusted_mode)
{ {
struct drm_i915_private *dev_priv = crtc->dev->dev_private; struct drm_i915_private *dev_priv = crtc->dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
...@@ -5202,7 +5201,7 @@ static void ironlake_set_pipeconf(struct drm_crtc *crtc, ...@@ -5202,7 +5201,7 @@ static void ironlake_set_pipeconf(struct drm_crtc *crtc,
val |= (PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_SP); val |= (PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_SP);
val &= ~PIPECONF_INTERLACE_MASK; val &= ~PIPECONF_INTERLACE_MASK;
if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) if (intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
val |= PIPECONF_INTERLACED_ILK; val |= PIPECONF_INTERLACED_ILK;
else else
val |= PIPECONF_PROGRESSIVE; val |= PIPECONF_PROGRESSIVE;
...@@ -5280,8 +5279,7 @@ static void intel_set_pipe_csc(struct drm_crtc *crtc) ...@@ -5280,8 +5279,7 @@ static void intel_set_pipe_csc(struct drm_crtc *crtc)
} }
} }
static void haswell_set_pipeconf(struct drm_crtc *crtc, static void haswell_set_pipeconf(struct drm_crtc *crtc)
struct drm_display_mode *adjusted_mode)
{ {
struct drm_i915_private *dev_priv = crtc->dev->dev_private; struct drm_i915_private *dev_priv = crtc->dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
...@@ -5295,7 +5293,7 @@ static void haswell_set_pipeconf(struct drm_crtc *crtc, ...@@ -5295,7 +5293,7 @@ static void haswell_set_pipeconf(struct drm_crtc *crtc,
val |= (PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_SP); val |= (PIPECONF_DITHER_EN | PIPECONF_DITHER_TYPE_SP);
val &= ~PIPECONF_INTERLACE_MASK_HSW; val &= ~PIPECONF_INTERLACE_MASK_HSW;
if (adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) if (intel_crtc->config.adjusted_mode.flags & DRM_MODE_FLAG_INTERLACE)
val |= PIPECONF_INTERLACED_ILK; val |= PIPECONF_INTERLACED_ILK;
else else
val |= PIPECONF_PROGRESSIVE; val |= PIPECONF_PROGRESSIVE;
...@@ -5753,7 +5751,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, ...@@ -5753,7 +5751,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
fdi_config_ok = ironlake_check_fdi_lanes(intel_crtc); fdi_config_ok = ironlake_check_fdi_lanes(intel_crtc);
ironlake_set_pipeconf(crtc, adjusted_mode); ironlake_set_pipeconf(crtc);
/* Set up the display plane register */ /* Set up the display plane register */
I915_WRITE(DSPCNTR(plane), DISPPLANE_GAMMA_ENABLE); I915_WRITE(DSPCNTR(plane), DISPPLANE_GAMMA_ENABLE);
...@@ -5877,7 +5875,7 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, ...@@ -5877,7 +5875,7 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc,
if (intel_crtc->config.has_pch_encoder) if (intel_crtc->config.has_pch_encoder)
ironlake_fdi_set_m_n(crtc); ironlake_fdi_set_m_n(crtc);
haswell_set_pipeconf(crtc, adjusted_mode); haswell_set_pipeconf(crtc);
intel_set_pipe_csc(crtc); intel_set_pipe_csc(crtc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment