| Message ID | 20240329011254.24160-17-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Bigjoiner modeset sequence redesign and MST support | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Ville > Syrjala > Sent: Friday, March 29, 2024 6:43 AM > To: intel-gfx@lists.freedesktop.org > Subject: [PATCH 16/22] drm/i915: Extract intel_ddi_post_disable_hdmi_or_sst() > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Extract the "not-MST" stuff from intel_ddi_post_disable() so that the whole > thing isn't so cluttered. > > The bigjoiner slave handling was outside of the !MST check, but it really should > have been inside it as its the counterpart to the master handling inside the > check. So we pull that in as well. There is no functional change here as we don't > currently support bigjoiner+MST anyway. > > v2: Rebase > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com> Thanks and Regards, Arun R Murthy ------------------- > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 52 +++++++++++------------- > 1 file changed, 24 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 24a9be2a217f..1130bfb7363c 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3092,39 +3092,35 @@ static void intel_ddi_post_disable_hdmi(struct > intel_atomic_state *state, > intel_dp_dual_mode_set_tmds_output(intel_hdmi, false); } > > +static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state > *state, > + struct intel_encoder *encoder, > + const struct intel_crtc_state > *old_crtc_state, > + const struct drm_connector_state > *old_conn_state) { > + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > + > + intel_crtc_vblank_off(old_crtc_state); > + > + intel_disable_transcoder(old_crtc_state); > + > + intel_ddi_disable_transcoder_func(old_crtc_state); > + > + intel_dsc_disable(old_crtc_state); > + > + if (DISPLAY_VER(dev_priv) >= 9) > + skl_scaler_disable(old_crtc_state); > + else > + ilk_pfit_disable(old_crtc_state); > +} > + > static void intel_ddi_post_disable(struct intel_atomic_state *state, > struct intel_encoder *encoder, > const struct intel_crtc_state *old_crtc_state, > const struct drm_connector_state > *old_conn_state) { > - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - struct intel_crtc *slave_crtc; > - > - if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) { > - intel_crtc_vblank_off(old_crtc_state); > - > - intel_disable_transcoder(old_crtc_state); > - > - intel_ddi_disable_transcoder_func(old_crtc_state); > - > - intel_dsc_disable(old_crtc_state); > - > - if (DISPLAY_VER(dev_priv) >= 9) > - skl_scaler_disable(old_crtc_state); > - else > - ilk_pfit_disable(old_crtc_state); > - } > - > - for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, > - > intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) { > - const struct intel_crtc_state *old_slave_crtc_state = > - intel_atomic_get_old_crtc_state(state, slave_crtc); > - > - intel_crtc_vblank_off(old_slave_crtc_state); > - > - intel_dsc_disable(old_slave_crtc_state); > - skl_scaler_disable(old_slave_crtc_state); > - } > + if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) > + intel_ddi_post_disable_hdmi_or_sst(state, encoder, > + old_crtc_state, > old_conn_state); > > /* > * When called from DP MST code: > -- > 2.43.2
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 24a9be2a217f..1130bfb7363c 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3092,39 +3092,35 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, intel_dp_dual_mode_set_tmds_output(intel_hdmi, false); } +static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, + struct intel_encoder *encoder, + const struct intel_crtc_state *old_crtc_state, + const struct drm_connector_state *old_conn_state) +{ + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + + intel_crtc_vblank_off(old_crtc_state); + + intel_disable_transcoder(old_crtc_state); + + intel_ddi_disable_transcoder_func(old_crtc_state); + + intel_dsc_disable(old_crtc_state); + + if (DISPLAY_VER(dev_priv) >= 9) + skl_scaler_disable(old_crtc_state); + else + ilk_pfit_disable(old_crtc_state); +} + static void intel_ddi_post_disable(struct intel_atomic_state *state, struct intel_encoder *encoder, const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - struct intel_crtc *slave_crtc; - - if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) { - intel_crtc_vblank_off(old_crtc_state); - - intel_disable_transcoder(old_crtc_state); - - intel_ddi_disable_transcoder_func(old_crtc_state); - - intel_dsc_disable(old_crtc_state); - - if (DISPLAY_VER(dev_priv) >= 9) - skl_scaler_disable(old_crtc_state); - else - ilk_pfit_disable(old_crtc_state); - } - - for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, slave_crtc, - intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) { - const struct intel_crtc_state *old_slave_crtc_state = - intel_atomic_get_old_crtc_state(state, slave_crtc); - - intel_crtc_vblank_off(old_slave_crtc_state); - - intel_dsc_disable(old_slave_crtc_state); - skl_scaler_disable(old_slave_crtc_state); - } + if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) + intel_ddi_post_disable_hdmi_or_sst(state, encoder, + old_crtc_state, old_conn_state); /* * When called from DP MST code: