| Message ID | 20240329011254.24160-19-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 18/22] drm/i915: Handle joined pipes inside hsw_crtc_disable() > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reorganize the crtc disable path to only deal with the master pipes/transcoders > in intel_old_crtc_state_disables() and offload the handling of joined pipes to > hsw_crtc_disable(). > This makes the whole thing much more sensible since we can actually control > the order in which we do the per-pipe vs. > per-transcoder modeset steps. > > v2: Use the name 'pipe_crtc' for the per-pipe crtc pointer > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_display.c | 64 ++++++++++++-------- > 1 file changed, 39 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > b/drivers/gpu/drm/i915/display/intel_display.c > index 58ee40786d5c..c15ea046c62a 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -1791,29 +1791,28 @@ static void hsw_crtc_disable(struct > intel_atomic_state *state, > const struct intel_crtc_state *old_crtc_state = > intel_atomic_get_old_crtc_state(state, crtc); > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > + struct intel_crtc *pipe_crtc; > > /* > * FIXME collapse everything to one hook. > * Need care with mst->ddi interactions. > */ > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > - intel_encoders_disable(state, crtc); > - intel_encoders_post_disable(state, crtc); > - } > - > - intel_disable_shared_dpll(old_crtc_state); > + intel_encoders_disable(state, crtc); > + intel_encoders_post_disable(state, crtc); > > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > - struct intel_crtc *slave_crtc; > + for_each_intel_crtc_in_pipe_mask(&i915->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_encoders_post_pll_disable(state, crtc); > + intel_disable_shared_dpll(old_pipe_crtc_state); > + } As per the sequence is considered, should the pll be disabled prior to disabling the encoders and then followed by post_pll_disable? Thanks and Regards, Arun R Murthy --------------------
On Mon, Apr 01, 2024 at 06:46:20AM +0000, Murthy, Arun R wrote: > > > -----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 18/22] drm/i915: Handle joined pipes inside hsw_crtc_disable() > > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Reorganize the crtc disable path to only deal with the master pipes/transcoders > > in intel_old_crtc_state_disables() and offload the handling of joined pipes to > > hsw_crtc_disable(). > > This makes the whole thing much more sensible since we can actually control > > the order in which we do the per-pipe vs. > > per-transcoder modeset steps. > > > > v2: Use the name 'pipe_crtc' for the per-pipe crtc pointer > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 64 ++++++++++++-------- > > 1 file changed, 39 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > b/drivers/gpu/drm/i915/display/intel_display.c > > index 58ee40786d5c..c15ea046c62a 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -1791,29 +1791,28 @@ static void hsw_crtc_disable(struct > > intel_atomic_state *state, > > const struct intel_crtc_state *old_crtc_state = > > intel_atomic_get_old_crtc_state(state, crtc); > > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > > + struct intel_crtc *pipe_crtc; > > > > /* > > * FIXME collapse everything to one hook. > > * Need care with mst->ddi interactions. > > */ > > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > - intel_encoders_disable(state, crtc); > > - intel_encoders_post_disable(state, crtc); > > - } > > - > > - intel_disable_shared_dpll(old_crtc_state); > > + intel_encoders_disable(state, crtc); > > + intel_encoders_post_disable(state, crtc); > > > > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > - struct intel_crtc *slave_crtc; > > + for_each_intel_crtc_in_pipe_mask(&i915->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_encoders_post_pll_disable(state, crtc); > > + intel_disable_shared_dpll(old_pipe_crtc_state); > > + } > > As per the sequence is considered, should the pll be disabled prior to disabling the encoders and then followed by post_pll_disable? The correct disable order is: 1. encoder disable() 2. disable transcoder/etc. (nop for hsw+ as that stuff has been sucked into the encoder hooks) 3. encoder post_disable() 4. pll disable 5. encoder post_pll_disable() which we should be following here, thouh the diff is rather hard to read due to the indentation changes.
> -----Original Message----- > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > Sent: Wednesday, April 3, 2024 1:20 AM > To: Murthy, Arun R <arun.r.murthy@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Subject: Re: [PATCH 18/22] drm/i915: Handle joined pipes inside > hsw_crtc_disable() > > On Mon, Apr 01, 2024 at 06:46:20AM +0000, Murthy, Arun R wrote: > > > > > -----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 18/22] drm/i915: Handle joined pipes inside > > > hsw_crtc_disable() > > > > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > Reorganize the crtc disable path to only deal with the master > > > pipes/transcoders in intel_old_crtc_state_disables() and offload the > > > handling of joined pipes to hsw_crtc_disable(). > > > This makes the whole thing much more sensible since we can actually > > > control the order in which we do the per-pipe vs. > > > per-transcoder modeset steps. > > > > > > v2: Use the name 'pipe_crtc' for the per-pipe crtc pointer > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 64 > > > ++++++++++++-------- > > > 1 file changed, 39 insertions(+), 25 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > > b/drivers/gpu/drm/i915/display/intel_display.c > > > index 58ee40786d5c..c15ea046c62a 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -1791,29 +1791,28 @@ static void hsw_crtc_disable(struct > > > intel_atomic_state *state, > > > const struct intel_crtc_state *old_crtc_state = > > > intel_atomic_get_old_crtc_state(state, crtc); > > > struct drm_i915_private *i915 = to_i915(crtc->base.dev); > > > + struct intel_crtc *pipe_crtc; > > > > > > /* > > > * FIXME collapse everything to one hook. > > > * Need care with mst->ddi interactions. > > > */ > > > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > > - intel_encoders_disable(state, crtc); > > > - intel_encoders_post_disable(state, crtc); > > > - } > > > - > > > - intel_disable_shared_dpll(old_crtc_state); > > > + intel_encoders_disable(state, crtc); > > > + intel_encoders_post_disable(state, crtc); > > > > > > - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { > > > - struct intel_crtc *slave_crtc; > > > + for_each_intel_crtc_in_pipe_mask(&i915->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_encoders_post_pll_disable(state, crtc); > > > + intel_disable_shared_dpll(old_pipe_crtc_state); > > > + } > > > > As per the sequence is considered, should the pll be disabled prior to disabling > the encoders and then followed by post_pll_disable? > > The correct disable order is: > 1. encoder disable() > 2. disable transcoder/etc. (nop for hsw+ as that stuff > has been sucked into the encoder hooks) 3. encoder post_disable() 4. pll > disable 5. encoder post_pll_disable() > > which we should be following here, thouh the diff is rather hard to read due to > the indentation changes. > Thanks for the clarification. I verified in the source code. Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com> Thanks and Regards, Arun R Murthy -------------------- > -- > Ville Syrjälä > Intel
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 58ee40786d5c..c15ea046c62a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1791,29 +1791,28 @@ static void hsw_crtc_disable(struct intel_atomic_state *state, const struct intel_crtc_state *old_crtc_state = intel_atomic_get_old_crtc_state(state, crtc); struct drm_i915_private *i915 = to_i915(crtc->base.dev); + struct intel_crtc *pipe_crtc; /* * FIXME collapse everything to one hook. * Need care with mst->ddi interactions. */ - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { - intel_encoders_disable(state, crtc); - intel_encoders_post_disable(state, crtc); - } - - intel_disable_shared_dpll(old_crtc_state); + intel_encoders_disable(state, crtc); + intel_encoders_post_disable(state, crtc); - if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) { - struct intel_crtc *slave_crtc; + for_each_intel_crtc_in_pipe_mask(&i915->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_encoders_post_pll_disable(state, crtc); + intel_disable_shared_dpll(old_pipe_crtc_state); + } - intel_dmc_disable_pipe(i915, crtc->pipe); + intel_encoders_post_pll_disable(state, crtc); - for_each_intel_crtc_in_pipe_mask(&i915->drm, slave_crtc, - intel_crtc_bigjoiner_slave_pipes(old_crtc_state)) - intel_dmc_disable_pipe(i915, slave_crtc->pipe); - } + for_each_intel_crtc_in_pipe_mask(&i915->drm, pipe_crtc, + intel_crtc_joined_pipe_mask(old_crtc_state)) + intel_dmc_disable_pipe(i915, pipe_crtc->pipe); } static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state) @@ -6784,21 +6783,31 @@ static void intel_old_crtc_state_disables(struct intel_atomic_state *state, struct intel_crtc *crtc) { struct drm_i915_private *dev_priv = to_i915(state->base.dev); - const struct intel_crtc_state *new_crtc_state = - intel_atomic_get_new_crtc_state(state, crtc); + const struct intel_crtc_state *old_crtc_state = + intel_atomic_get_old_crtc_state(state, crtc); + struct intel_crtc *pipe_crtc; /* * We need to disable pipe CRC before disabling the pipe, * or we race against vblank off. */ - intel_crtc_disable_pipe_crc(crtc); + for_each_intel_crtc_in_pipe_mask(&dev_priv->drm, pipe_crtc, + intel_crtc_joined_pipe_mask(old_crtc_state)) + intel_crtc_disable_pipe_crc(pipe_crtc); dev_priv->display.funcs.display->crtc_disable(state, crtc); - crtc->active = false; - intel_fbc_disable(crtc); - if (!new_crtc_state->hw.active) - intel_initial_watermarks(state, crtc); + 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 *new_pipe_crtc_state = + intel_atomic_get_new_crtc_state(state, pipe_crtc); + + pipe_crtc->active = false; + intel_fbc_disable(pipe_crtc); + + if (!new_pipe_crtc_state->hw.active) + intel_initial_watermarks(state, pipe_crtc); + } } static void intel_commit_modeset_disables(struct intel_atomic_state *state) @@ -6838,19 +6847,21 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) if ((disable_pipes & BIT(crtc->pipe)) == 0) continue; + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) + continue; + /* In case of Transcoder port Sync master slave CRTCs can be * assigned in any order and we need to make sure that * slave CRTCs are disabled first and then master CRTC since * Slave vblanks are masked till Master Vblanks. */ if (!is_trans_port_sync_slave(old_crtc_state) && - !intel_dp_mst_is_slave_trans(old_crtc_state) && - !intel_crtc_is_bigjoiner_slave(old_crtc_state)) + !intel_dp_mst_is_slave_trans(old_crtc_state)) continue; intel_old_crtc_state_disables(state, crtc); - disable_pipes &= ~BIT(crtc->pipe); + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); } /* Disable everything else left on */ @@ -6858,9 +6869,12 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state) if ((disable_pipes & BIT(crtc->pipe)) == 0) continue; + if (intel_crtc_is_bigjoiner_slave(old_crtc_state)) + continue; + intel_old_crtc_state_disables(state, crtc); - disable_pipes &= ~BIT(crtc->pipe); + disable_pipes &= ~intel_crtc_joined_pipe_mask(old_crtc_state); } drm_WARN_ON(&i915->drm, disable_pipes);