aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-10-11 06:04:55 -0400
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2018-10-16 09:52:00 -0400
commitc5b36facfad802d11e66c3fe5bd2ea6d70c33dfd (patch)
tree843adcfa33a2ec3e36fa6b31c032710ed95bd9e3
parent91d78197629622edd888a10650a8252351ad0b8f (diff)
drm/i915: Pass crtc_state to lpt_program_iclkip
Instead of derferencing crtc->config, look at crtc_state. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181011100457.8776-9-maarten.lankhorst@linux.intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f93e17a237ed..8535ffe87925 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4445,10 +4445,11 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv)
4445} 4445}
4446 4446
4447/* Program iCLKIP clock to the desired frequency */ 4447/* Program iCLKIP clock to the desired frequency */
4448static void lpt_program_iclkip(struct intel_crtc *crtc) 4448static void lpt_program_iclkip(const struct intel_crtc_state *crtc_state)
4449{ 4449{
4450 struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
4450 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); 4451 struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
4451 int clock = crtc->config->base.adjusted_mode.crtc_clock; 4452 int clock = crtc_state->base.adjusted_mode.crtc_clock;
4452 u32 divsel, phaseinc, auxdiv, phasedir = 0; 4453 u32 divsel, phaseinc, auxdiv, phasedir = 0;
4453 u32 temp; 4454 u32 temp;
4454 4455
@@ -4757,7 +4758,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
4757 4758
4758 assert_pch_transcoder_disabled(dev_priv, PIPE_A); 4759 assert_pch_transcoder_disabled(dev_priv, PIPE_A);
4759 4760
4760 lpt_program_iclkip(crtc); 4761 lpt_program_iclkip(crtc_state);
4761 4762
4762 /* Set transcoder timing. */ 4763 /* Set transcoder timing. */
4763 ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A); 4764 ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);