Skip to content

Commit

Permalink
drm/i915: Move the TRANS_DDI_FUNC_CTL enable to a later point
Browse files Browse the repository at this point in the history
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ä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200417134720.16654-2-ville.syrjala@linux.intel.com
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Ville Syrjälä committed Apr 20, 2020
1 parent 02a715c commit c387309
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/display/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit c387309

Please sign in to comment.