| Message ID | 20230425105450.18441-13-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dsi: ICL+ DSI modeset sequence fixes | expand |
On Tue, 25 Apr 2023, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Follow what Windows does and do the DSI panel reset+power off > after everything else. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/icl_dsi.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c > index d133cd450271..30b1ad51b0c5 100644 > --- a/drivers/gpu/drm/i915/display/icl_dsi.c > +++ b/drivers/gpu/drm/i915/display/icl_dsi.c > @@ -1291,12 +1291,6 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder) > struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > > intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_OFF); > - intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET); > - > - msleep(intel_dsi->panel_off_delay); > - intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF); > - > - intel_dsi->panel_power_off_time = ktime_get_boottime(); > > /* ensure cmds dispatched to panel */ > wait_for_cmds_dispatched_to_panel(encoder); > @@ -1408,6 +1402,7 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state, > const struct intel_crtc_state *old_crtc_state, > const struct drm_connector_state *old_conn_state) > { > + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); > struct intel_crtc *crtc = to_intel_crtc(old_conn_state->crtc); > > intel_crtc_vblank_off(old_crtc_state); > @@ -1434,6 +1429,13 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state, > > /* step4: disable IO power */ > gen11_dsi_disable_io_power(encoder); > + > + intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET); > + > + intel_dsi_msleep(intel_dsi, intel_dsi->panel_off_delay); Rebase fail? This replaces msleep again with intel_dsi_msleep. Otherwise, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > + intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF); > + > + intel_dsi->panel_power_off_time = ktime_get_boottime(); > } > > static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,
diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index d133cd450271..30b1ad51b0c5 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -1291,12 +1291,6 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder) struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_OFF); - intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET); - - msleep(intel_dsi->panel_off_delay); - intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF); - - intel_dsi->panel_power_off_time = ktime_get_boottime(); /* ensure cmds dispatched to panel */ wait_for_cmds_dispatched_to_panel(encoder); @@ -1408,6 +1402,7 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state, const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder); struct intel_crtc *crtc = to_intel_crtc(old_conn_state->crtc); intel_crtc_vblank_off(old_crtc_state); @@ -1434,6 +1429,13 @@ static void gen11_dsi_post_disable(struct intel_atomic_state *state, /* step4: disable IO power */ gen11_dsi_disable_io_power(encoder); + + intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_ASSERT_RESET); + + intel_dsi_msleep(intel_dsi, intel_dsi->panel_off_delay); + intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_POWER_OFF); + + intel_dsi->panel_power_off_time = ktime_get_boottime(); } static enum drm_mode_status gen11_dsi_mode_valid(struct drm_connector *connector,