| Message ID | 20240308131146.32714-4-stanislav.lisovskiy@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Bigjoiner refactoring | expand |
On Fri, Mar 8, 2024 at 5:11 AM Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> wrote: > > Unify the master vs. slave handling in > intel_ddi_post_disable_hdmi_or_sst() by looping over all the > pipes in one go. How will we handle looping through all joined pipes for MST case, does this need to be accounted for in the last patch that enables bigjoiner for MST now that we have separated out ddi_post_disable for hdmi/sst? Manasi > > This also lets us move the intel_crtc_vblank_off() calls to > happen in a consistent place vs. the transcoder disable. > Previously we did the master vs. slaves on different sides > of that. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> > Credits-to: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 34 ++++++++++++------------ > 1 file changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 5628a4ab608d4..15441674c6f58 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3097,34 +3097,34 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, > > static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, > struct intel_encoder *encoder, > - const struct intel_crtc_state *old_master_crtc_state, > + 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; > + u8 pipe_mask = intel_crtc_joined_pipe_mask(old_crtc_state); > + struct intel_crtc *crtc; > + > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) { > + const struct intel_crtc_state *_old_crtc_state = > + intel_atomic_get_old_crtc_state(state, crtc); > > - intel_crtc_vblank_off(old_crtc_state); > + 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); > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) { > + const struct intel_crtc_state *_old_crtc_state = > + intel_atomic_get_old_crtc_state(state, crtc); > > - if (DISPLAY_VER(dev_priv) >= 9) > - skl_scaler_disable(old_crtc_state); > - else > - ilk_pfit_disable(old_crtc_state); > + intel_dsc_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 (DISPLAY_VER(dev_priv) >= 9) > + skl_scaler_disable(_old_crtc_state); > + else > + ilk_pfit_disable(_old_crtc_state); > } > } > > -- > 2.37.3 >
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 5628a4ab608d4..15441674c6f58 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3097,34 +3097,34 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, struct intel_encoder *encoder, - const struct intel_crtc_state *old_master_crtc_state, + 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; + u8 pipe_mask = intel_crtc_joined_pipe_mask(old_crtc_state); + struct intel_crtc *crtc; + + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) { + const struct intel_crtc_state *_old_crtc_state = + intel_atomic_get_old_crtc_state(state, crtc); - intel_crtc_vblank_off(old_crtc_state); + 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); + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, crtc, pipe_mask) { + const struct intel_crtc_state *_old_crtc_state = + intel_atomic_get_old_crtc_state(state, crtc); - if (DISPLAY_VER(dev_priv) >= 9) - skl_scaler_disable(old_crtc_state); - else - ilk_pfit_disable(old_crtc_state); + intel_dsc_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 (DISPLAY_VER(dev_priv) >= 9) + skl_scaler_disable(_old_crtc_state); + else + ilk_pfit_disable(_old_crtc_state); } }