GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Pass crtc_state to lpt_program_iclkip

Browse source 
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
This commit is contained in:
Maarten Lankhorst 2018-10-11 12:04:55 +02:00
parent 91d7819762
commit c5b36facfa
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/gpu/drm/i915/intel_display.c
View file

@ -4445,10 +4445,11 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv)
} }
/* Program iCLKIP clock to the desired frequency */ /* Program iCLKIP clock to the desired frequency */
static void lpt_program_iclkip(struct intel_crtc *crtc) static void lpt_program_iclkip(const struct intel_crtc_state *crtc_state)
{ {
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
int clock = crtc->config->base.adjusted_mode.crtc_clock; int clock = crtc_state->base.adjusted_mode.crtc_clock;
u32 divsel, phaseinc, auxdiv, phasedir = 0; u32 divsel, phaseinc, auxdiv, phasedir = 0;
u32 temp; u32 temp;
@ -4757,7 +4758,7 @@ static void lpt_pch_enable(const struct intel_atomic_state *state,
assert_pch_transcoder_disabled(dev_priv, PIPE_A); assert_pch_transcoder_disabled(dev_priv, PIPE_A);
lpt_program_iclkip(crtc); lpt_program_iclkip(crtc_state);
/* Set transcoder timing. */ /* Set transcoder timing. */
ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A); ironlake_pch_transcoder_set_timings(crtc_state, PIPE_A);