summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/display/icl_dsi.c
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2023-06-08 23:30:53 +0300
committerVille Syrjälä <ville.syrjala@linux.intel.com>2023-06-13 19:06:39 +0300
commit29428c85be1d5836fe1238775df85e9cd651a3fa (patch)
treeaacbc151c76f2ae6971505087222581f4dc6dbc7 /drivers/gpu/drm/i915/display/icl_dsi.c
parenta57aa1e3691933869d2bb491ba38a22cfa71e387 (diff)
downloadlinux-29428c85be1d5836fe1238775df85e9cd651a3fa.tar.xz
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
Diffstat (limited to 'drivers/gpu/drm/i915/display/icl_dsi.c')
-rw-r--r--drivers/gpu/drm/i915/display/icl_dsi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index a33721bac5ae..ac5f30fc51bb 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,