diff options
| author | Ville Syrjälä <[email protected]> | 2020-04-17 16:47:18 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2020-04-20 21:21:10 +0300 |
| commit | c38730987b4a3652ed2c350a2679ca228b0ab284 (patch) | |
| tree | 58d1a6b92939128d6dd0fd39ad836061dd583d58 | |
| parent | 02a715c371d2b411687fbbb1e57020bcbc41f6c4 (diff) | |
drm/i915: Move the TRANS_DDI_FUNC_CTL enable to a later point
No reason that I can see why we should enable TRANS_DDI_FUNC_CTL
before we set up the watermarks of configure the mbus stuff.
In fact reordering these seems to match the bspec sequence better,
and crucially will allow us to push the TRANS_DDI_FUNC_CTL enable
into the encoder enable hook as a followup.
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Acked-by: Chris Wilson <[email protected]>
Acked-by: Jani Nikula <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index bae1d89875d6..55e7c499e7c7 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -7071,15 +7071,15 @@ static void hsw_crtc_enable(struct intel_atomic_state *state, if (INTEL_GEN(dev_priv) >= 11) icl_set_pipe_chicken(crtc); - if (!transcoder_is_dsi(cpu_transcoder)) - intel_ddi_enable_transcoder_func(new_crtc_state); - if (dev_priv->display.initial_watermarks) dev_priv->display.initial_watermarks(state, crtc); if (INTEL_GEN(dev_priv) >= 11) icl_pipe_mbus_enable(crtc); + if (!transcoder_is_dsi(cpu_transcoder)) + intel_ddi_enable_transcoder_func(new_crtc_state); + intel_encoders_enable(state, crtc); if (psl_clkgate_wa) { |