drm/i915/dsi: Do DSC/scaler disable earlier on icl+

Do the scaler disable in the spot where bspec has specfied it
for TGL+. And also move the DSC disable to match what
intel_ddi.c does.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230608203057.23759-10-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index a33721bac5aea10fba44e110fb44b8e4b5602385..ac5f30fc51bb19fa3bdf6113dfe5ba051e079385 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -1422,6 +1422,9 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state,
        /* step2h,i,j: deconfig trancoder */
        gen11_dsi_deconfigure_trancoder(encoder);
 
+       intel_dsc_disable(old_crtc_state);
+       skl_scaler_disable(old_crtc_state);
+
        /* step3: disable port */
        gen11_dsi_disable_port(encoder);
 
@@ -1429,10 +1432,6 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state,
 
        /* step4: disable IO power */
        gen11_dsi_disable_io_power(encoder);
-
-       intel_dsc_disable(old_crtc_state);
-
-       skl_scaler_disable(old_crtc_state);
 }
 
 static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,