Commit 5e1cdf54 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Make ironlake_pch_transcoder_set_timings take crtc_state

Instead of passing crtc and dereferencing crtc->config,
pass the correct crtc_state and obtain the crtc pointer from there.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181004094604.2646-8-maarten.lankhorst@linux.intel.com
parent 65c307fd
...@@ -4608,12 +4608,12 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv) ...@@ -4608,12 +4608,12 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)
desired_divisor << auxdiv); desired_divisor << auxdiv);
} }
static void ironlake_pch_transcoder_set_timings(struct intel_crtc *crtc, static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_state,
enum pipe pch_transcoder) enum pipe pch_transcoder)
{ {
struct drm_device *dev = crtc->base.dev; struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
enum transcoder cpu_transcoder = crtc->config->cpu_transcoder; enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
I915_WRITE(PCH_TRANS_HTOTAL(pch_transcoder), I915_WRITE(PCH_TRANS_HTOTAL(pch_transcoder),
I915_READ(HTOTAL(cpu_transcoder))); I915_READ(HTOTAL(cpu_transcoder)));
...@@ -4762,7 +4762,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state, ...@@ -4762,7 +4762,7 @@ static void ironlake_pch_enable(const struct intel_atomic_state *state,
/* set transcoder timing, panel must allow it */ /* set transcoder timing, panel must allow it */
assert_panel_unlocked(dev_priv, pipe); assert_panel_unlocked(dev_priv, pipe);
ironlake_pch_transcoder_set_timings(crtc, pipe); ironlake_pch_transcoder_set_timings(crtc_state, pipe);
intel_fdi_normal_train(crtc); intel_fdi_normal_train(crtc);
...@@ -4809,7 +4809,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state, ...@@ -4809,7 +4809,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
lpt_program_iclkip(crtc); lpt_program_iclkip(crtc);
/* Set transcoder timing. */ /* Set transcoder timing. */
ironlake_pch_transcoder_set_timings(crtc, PIPE_A); ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);
lpt_enable_pch_transcoder(dev_priv, cpu_transcoder); lpt_enable_pch_transcoder(dev_priv, cpu_transcoder);
} }
......
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