| Message ID | 20240329011254.24160-18-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 17/22] drm/i915: Utilize intel_crtc_joined_pipe_mask() more > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Unify the master vs. slave handling in > intel_ddi_post_disable_hdmi_or_sst() by looping over all the pipes in one go. > > 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. > > v2: Use the name 'pipe_crtc' for the per-pipe crtc pointer > > 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 | 25 ++++++++++++++++++------ > 1 file changed, 19 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index 1130bfb7363c..af34e905a85d 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3098,19 +3098,32 @@ static void > intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, > const struct drm_connector_state > *old_conn_state) { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > + struct intel_crtc *pipe_crtc; > > - intel_crtc_vblank_off(old_crtc_state); > + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, > + > intel_crtc_joined_pipe_mask(old_crtc_state)) { > + const struct intel_crtc_state *old_pipe_crtc_state = > + intel_atomic_get_old_crtc_state(state, pipe_crtc); > + > + intel_crtc_vblank_off(old_pipe_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, pipe_crtc, > + > intel_crtc_joined_pipe_mask(old_crtc_state)) { > + const struct intel_crtc_state *old_pipe_crtc_state = > + intel_atomic_get_old_crtc_state(state, pipe_crtc); > > - if (DISPLAY_VER(dev_priv) >= 9) > - skl_scaler_disable(old_crtc_state); > - else > - ilk_pfit_disable(old_crtc_state); > + intel_dsc_disable(old_pipe_crtc_state); > + > + if (DISPLAY_VER(dev_priv) >= 9) > + skl_scaler_disable(old_pipe_crtc_state); > + else > + ilk_pfit_disable(old_pipe_crtc_state); > + } > } > > static void intel_ddi_post_disable(struct intel_atomic_state *state, > -- > 2.43.2
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 1130bfb7363c..af34e905a85d 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3098,19 +3098,32 @@ static void intel_ddi_post_disable_hdmi_or_sst(struct intel_atomic_state *state, const struct drm_connector_state *old_conn_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_crtc *pipe_crtc; - intel_crtc_vblank_off(old_crtc_state); + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, + intel_crtc_joined_pipe_mask(old_crtc_state)) { + const struct intel_crtc_state *old_pipe_crtc_state = + intel_atomic_get_old_crtc_state(state, pipe_crtc); + + intel_crtc_vblank_off(old_pipe_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, pipe_crtc, + intel_crtc_joined_pipe_mask(old_crtc_state)) { + const struct intel_crtc_state *old_pipe_crtc_state = + intel_atomic_get_old_crtc_state(state, pipe_crtc); - if (DISPLAY_VER(dev_priv) >= 9) - skl_scaler_disable(old_crtc_state); - else - ilk_pfit_disable(old_crtc_state); + intel_dsc_disable(old_pipe_crtc_state); + + if (DISPLAY_VER(dev_priv) >= 9) + skl_scaler_disable(old_pipe_crtc_state); + else + ilk_pfit_disable(old_pipe_crtc_state); + } } static void intel_ddi_post_disable(struct intel_atomic_state *state,