From c38730987b4a3652ed2c350a2679ca228b0ab284 Mon Sep 17 00:00:00 2001 From: Ville Syrjälä Date: Fri, 17 Apr 2020 16:47:18 +0300 Subject: drm/i915: Move the TRANS_DDI_FUNC_CTL enable to a later point MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ä Link: https://patchwork.freedesktop.org/patch/msgid/20200417134720.16654-2-ville.syrjala@linux.intel.com Acked-by: Chris Wilson Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') 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) { -- cgit