From: Ville Syrjälä Date: Thu, 8 Jun 2023 20:30:53 +0000 (+0300) Subject: drm/i915/dsi: Do DSC/scaler disable earlier on icl+ X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=29428c85be1d5836fe1238775df85e9cd651a3fa;p=linux.git 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 Signed-off-by: Ville Syrjälä 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 a33721bac5aea..ac5f30fc51bb1 100644 --- 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,