On Thu, Dec 07, 2023 at 06:06:38PM +0200, Ville Syrjälä wrote:
> On Thu, Dec 07, 2023 at 05:47:02PM +0200, Imre Deak wrote:
> > On Thu, Dec 07, 2023 at 05:24:44PM +0200, Ville Syrjälä wrote:
> > > On Thu, Dec 07, 2023 at 04:55:02PM +0200, Imre Deak wrote:
> > > > On Fri, Nov 24, 2023 at 10:27:34AM +0200, Ville Syrjala wrote:
> > > > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > > >
> > > > > TC ports have both the MG/TC and TBT PLLs selected simultanously (so
> > > > > that we can switch from MG/TC to TBT as a fallback). This doesn't play
> > > > > well with the state checker that assumes that the old PLL shouldn't
> > > > > have the pipe in its pipe_mask anymore. Suppress that check for these
> > > > > PLLs to avoid spurious WARNs when you disconnect a TC port and a
> > > > > non-disabling modeset happens before actually disabling the port.
> > > > >
> > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > >
> > > > Looks ok to me:
> > > > Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> > > >
> > > > I suppose the check would be still valid for MG PLLs, but the port
> > > > PLL stuff makes doing that cumbersome.
> > >
> > > You mean for legacy ports?
> >
> > Yes, I suppose in that case too, but in general the state check doesn't
> > work only if the shared_dpll in either the the old or new crtc state is
> > the TBT PLL and in the other state it's MG PLL. If the PLL in both
> > states are MG PLL the state check would be still valid, if I didn't miss
> > something.
>
> Oh you mean switching from one MG PLL to another MG PLL?
> Yeah, that in theory we'd still want to check.
>
> Hmm. Maybe if we flag only the TBT PLL as special and
> then skip the assert only when either the old or new PLL
> is the TBT PLL?
Yes, I guess that would work.
> > > > > ---
> > > > > drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 56 +++++++++++++------
> > > > > drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 4 ++
> > > > > 2 files changed, 42 insertions(+), 18 deletions(-)
> > > > >
> > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > > > > index d86b02de2923..5c6c4fc50b1d 100644
> > > > > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > > > > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
> > > > > @@ -4023,11 +4023,16 @@ static const struct intel_shared_dpll_funcs mg_pll_funcs = {
> > > > > static const struct dpll_info icl_plls[] = {
> > > > > { .name = "DPLL 0", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL0, },
> > > > > { .name = "DPLL 1", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL1, },
> > > > > - { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL, },
> > > > > - { .name = "MG PLL 1", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL1, },
> > > > > - { .name = "MG PLL 2", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL2, },
> > > > > - { .name = "MG PLL 3", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL3, },
> > > > > - { .name = "MG PLL 4", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL4, },
> > > > > + { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "MG PLL 1", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL1,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "MG PLL 2", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL2,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "MG PLL 3", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL3,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "MG PLL 4", .funcs = &mg_pll_funcs, .id = DPLL_ID_ICL_MGPLL4,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > {}
> > > > > };
> > > > >
> > > > > @@ -4068,13 +4073,20 @@ static const struct intel_shared_dpll_funcs dkl_pll_funcs = {
> > > > > static const struct dpll_info tgl_plls[] = {
> > > > > { .name = "DPLL 0", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL0, },
> > > > > { .name = "DPLL 1", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL1, },
> > > > > - { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL, },
> > > > > - { .name = "TC PLL 1", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL1, },
> > > > > - { .name = "TC PLL 2", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL2, },
> > > > > - { .name = "TC PLL 3", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL3, },
> > > > > - { .name = "TC PLL 4", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL4, },
> > > > > - { .name = "TC PLL 5", .funcs = &dkl_pll_funcs, .id = DPLL_ID_TGL_MGPLL5, },
> > > > > - { .name = "TC PLL 6", .funcs = &dkl_pll_funcs, .id = DPLL_ID_TGL_MGPLL6, },
> > > > > + { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 1", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL1,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 2", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL2,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 3", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL3,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 4", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL4,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 5", .funcs = &dkl_pll_funcs, .id = DPLL_ID_TGL_MGPLL5,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 6", .funcs = &dkl_pll_funcs, .id = DPLL_ID_TGL_MGPLL6,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > {}
> > > > > };
> > > > >
> > > > > @@ -4141,11 +4153,16 @@ static const struct intel_dpll_mgr adls_pll_mgr = {
> > > > > static const struct dpll_info adlp_plls[] = {
> > > > > { .name = "DPLL 0", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL0, },
> > > > > { .name = "DPLL 1", .funcs = &combo_pll_funcs, .id = DPLL_ID_ICL_DPLL1, },
> > > > > - { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL, },
> > > > > - { .name = "TC PLL 1", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL1, },
> > > > > - { .name = "TC PLL 2", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL2, },
> > > > > - { .name = "TC PLL 3", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL3, },
> > > > > - { .name = "TC PLL 4", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL4, },
> > > > > + { .name = "TBT PLL", .funcs = &tbt_pll_funcs, .id = DPLL_ID_ICL_TBTPLL,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 1", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL1,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 2", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL2,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 3", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL3,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > + { .name = "TC PLL 4", .funcs = &dkl_pll_funcs, .id = DPLL_ID_ICL_MGPLL4,
> > > > > + .flags = INTEL_DPLL_HAS_ALT_PORT_DPLL, },
> > > > > {}
> > > > > };
> > > > >
> > > > > @@ -4535,7 +4552,10 @@ void intel_shared_dpll_state_verify(struct intel_atomic_state *state,
> > > > > I915_STATE_WARN(i915, pll->active_mask & pipe_mask,
> > > > > "%s: pll active mismatch (didn't expect pipe %c in active mask (0x%x))\n",
> > > > > pll->info->name, pipe_name(crtc->pipe), pll->active_mask);
> > > > > - I915_STATE_WARN(i915, pll->state.pipe_mask & pipe_mask,
> > > > > +
> > > > > + /* TC ports have both MG/TC and TBT PLL referenced simultaneously */
> > > > > + I915_STATE_WARN(i915, !(pll->info->flags & INTEL_DPLL_HAS_ALT_PORT_DPLL) &&
> > > > > + pll->state.pipe_mask & pipe_mask,
> > > > > "%s: pll enabled crtcs mismatch (found pipe %c in enabled mask (0x%x))\n",
> > > > > pll->info->name, pipe_name(crtc->pipe), pll->state.pipe_mask);
> > > > > }
> > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > > > > index 2e7ea0d8d3ff..594658087b4a 100644
> > > > > --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > > > > +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.h
> > > > > @@ -277,12 +277,16 @@ struct dpll_info {
> > > > > enum intel_display_power_domain power_domain;
> > > > >
> > > > > #define INTEL_DPLL_ALWAYS_ON (1 << 0)
> > > > > +#define INTEL_DPLL_HAS_ALT_PORT_DPLL (1 << 1)
> > > > > /**
> > > > > * @flags:
> > > > > *
> > > > > * INTEL_DPLL_ALWAYS_ON
> > > > > * Inform the state checker that the DPLL is kept enabled even if
> > > > > * not in use by any CRTC.
> > > > > + * INTEL_DPLL_HAS_ALT_PORT_DPLL
> > > > > + * Inform the state checker that the CRTC will have two port DPLLs
> > > > > + * referenced simultanously (for TC->TBT fallback).
> > > > > */
> > > > > u32 flags;
> > > > > };
> > > > > --
> > > > > 2.41.0
> > > > >
> > >
> > > --
> > > Ville Syrjälä
> > > Intel
>
> --
> Ville Syrjälä
> Intel
