On Wed, 2023-02-08 at 09:41 +0200, Imre Deak wrote:
> On Tue, Feb 07, 2023 at 07:21:48PM -0500, Lyude Paul wrote:
> > On Tue, 2023-02-07 at 14:11 +0200, Imre Deak wrote:
> >
> > And then disabled say, payload #1, that immediately after we get the ACT that
> > the payload table in hardware would look like this:
> >
> > Payload #2: 15 slots, start_slot=0
> > Payload #3: 15 slots, start_slot=15
>
> The above is the actual and expected HW state state yes.
>
> > But it sounds like it actually would look like this in the real world?
> >
> > Payload #2: 15 slots, start_slot=15
> > Payload #3: 15 slots, start_slot=30
>
> No, the problem currently is not that start_slot of the subsequent
> payloads are not shifted towards the beginning. Rather the atomic state
> doesn't get updated properly, becoming out of sync with the HW. For
> instance in a commit resizing payload #1, in the commit phase
> (intel_atomic_commit_tail()) will begin by removing payload #1. The
> initial state is
>
> old payload state new payload state
> Payload #1: 15 slots, start_slot=0 20 slots, start_slot=0
> Payload #2: 15 slots, start_slot=15 15 slots, start_slot=15
> Payload #3: 15 slots, start_slot=30 15 slots, start_slot=30
>
> mgr->next_start_slot = 45
>
> intel_mst_disable_dp() will pass the old MST and payload state to
> drm_dp_remove_payload(): The MST state was added during atomic check,
> since payload #1 changed, then intel_atomic_commit() ->
> drm_atomic_helper_swap_state() sets the MST current state (returned by
> drm_atomic_get_mst_topology_state()) to point to the old state. So at
OK - this took me a while to wrap my head around but you're completely right.
It appears I totally misunderstood where the state swapping actually happens
during the check -> commit sequence. I think if that's how things work too
then yeah, it definitely might not be a bad idea to move the start slot out of
the atomic state :P. I guess we could just keep this in the mst manager struct
instead of the commit state and make the rules for access be the same: protect
them through commit ordering, and document that the proper way of accessing
start values outside of the context of an atomic commit (if this was needed
for some reason) is:
* grab mst lock
* call drm_dp_mst_atomic_wait_for_dependencies()
* read values under lock
Thank y'all again so much for helping out with this! It is super appreciated,
and once you guys push these patches upstream I will look into adopting this
for nouveau. I already poked some folks from AMD as well to make sure they're
keeping an eye on this (although looking at the Cc I realize they were already
added a while ago, whoops lol).
> the point drm_dp_remove_payload() returns we have:
>
> old payload state new payload state
> Payload #1: 15 slots, start_slot=-1 20 slots, start_slot=0
> Payload #2: 15 slots, start_slot=0 15 slots, start_slot=15
> Payload #3: 15 slots, start_slot=15 15 slots, start_slot=30
>
> mgr->next_start_slot = 30
>
> then after re-enabling payload #1, after drm_dp_add_payload_part1()
> returns (passing to it the new MST and payload state) we have:
>
> old payload state new payload state
> Payload #1: 15 slots, start_slot=-1 20 slots, start_slot=30
> Payload #2: 15 slots, start_slot=0 15 slots, start_slot=15
> Payload #3: 15 slots, start_slot=15 15 slots, start_slot=30
>
> mgr->next_start_slot = 50
>
> So in the new SW state payload #1 and #3 incorrectly overlap, with the
> actual HW state being:
>
> Payload #1: 20 slots, start_slot=30
> Payload #2: 15 slots, start_slot=0
> Payload #3: 15 slots, start_slot=15
>
> A subsequent commit will see the wrong start_slot in the SW state for
> payload #2 (15) and #3 (30).
>
> > So I'm curious, is there something I missed here? At what point does the MST
> > hub at the other end decide that it's time to move the start slots back?
>
> The hub shifts back payloads after the DPCD write command to 0x1c0 -
> 0x1c2 to remove a payload. (The HW OTOH does the corresponding shift at
> the point of disabling the stream, in intel_mst_post_disable_dp() ->
> intel_disable_transcoder() for i915).
>
> > (keep in mind, the MST specification does explicitly mention that
> > there should never be holes in the payload table - so something has to
> > be shifting the payloads back).
>
> Right, the hubs I checked conform to this.
>
> > > > So if you guys think it'd be better design-wise to store this something else,
> > > > I've got no strong feelings either way
> > > > >
> > > > > > For 0-2:
> > > > > >
> > > > > > Reviewed-by: Lyude Paul <lyude@xxxxxxxxxx>
> > > > >
> > > > > Thanks.
> > > > >
> > > > > >
> > > > > > >
> > > > > > > Cc: Lyude Paul <lyude@xxxxxxxxxx>
> > > > > > > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > > > > > Cc: Ben Skeggs <bskeggs@xxxxxxxxxx>
> > > > > > > Cc: Karol Herbst <kherbst@xxxxxxxxxx>
> > > > > > > Cc: Harry Wentland <harry.wentland@xxxxxxx>
> > > > > > > Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> > > > > > > Cc: Wayne Lin <Wayne.Lin@xxxxxxx>
> > > > > > > Cc: stable@xxxxxxxxxxxxxxx # 6.1
> > > > > > > Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> > > > > > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> > > > > > > Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> > > > > > > ---
> > > > > > > .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
> > > > > > > drivers/gpu/drm/display/drm_dp_mst_topology.c | 26 ++++++++++---------
> > > > > > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 ++-
> > > > > > > drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> > > > > > > include/drm/display/drm_dp_mst_helper.h | 3 ++-
> > > > > > > 5 files changed, 21 insertions(+), 16 deletions(-)
> > > > > > >
> > > > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> > > > > > > index a50319fc42b11..180d3893b68da 100644
> > > > > > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> > > > > > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
> > > > > > > @@ -208,7 +208,7 @@ bool dm_helpers_dp_mst_write_payload_allocation_table(
> > > > > > > if (enable)
> > > > > > > drm_dp_add_payload_part1(mst_mgr, mst_state, payload);
> > > > > > > else
> > > > > > > - drm_dp_remove_payload(mst_mgr, mst_state, payload);
> > > > > > > + drm_dp_remove_payload(mst_mgr, mst_state, payload, payload);
> > > > > > >
> > > > > > > /* mst_mgr->->payloads are VC payload notify MST branch using DPCD or
> > > > > > > * AUX message. The sequence is slot 1-63 allocated sequence for each
> > > > > > > diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > > > > > > index 847c10aa2098c..1990ff5dc7ddd 100644
> > > > > > > --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > > > > > > +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
> > > > > > > @@ -3342,7 +3342,8 @@ EXPORT_SYMBOL(drm_dp_add_payload_part1);
> > > > > > > * drm_dp_remove_payload() - Remove an MST payload
> > > > > > > * @mgr: Manager to use.
> > > > > > > * @mst_state: The MST atomic state
> > > > > > > - * @payload: The payload to write
> > > > > > > + * @old_payload: The payload with its old state
> > > > > > > + * @new_payload: The payload to write
> > > > > > > *
> > > > > > > * Removes a payload from an MST topology if it was successfully assigned a start slot. Also updates
> > > > > > > * the starting time slots of all other payloads which would have been shifted towards the start of
> > > > > > > @@ -3350,36 +3351,37 @@ EXPORT_SYMBOL(drm_dp_add_payload_part1);
> > > > > > > */
> > > > > > > void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
> > > > > > > struct drm_dp_mst_topology_state *mst_state,
> > > > > > > - struct drm_dp_mst_atomic_payload *payload)
> > > > > > > + const struct drm_dp_mst_atomic_payload *old_payload,
> > > > > > > + struct drm_dp_mst_atomic_payload *new_payload)
> > > > > > > {
> > > > > > > struct drm_dp_mst_atomic_payload *pos;
> > > > > > > bool send_remove = false;
> > > > > > >
> > > > > > > /* We failed to make the payload, so nothing to do */
> > > > > > > - if (payload->vc_start_slot == -1)
> > > > > > > + if (new_payload->vc_start_slot == -1)
> > > > > > > return;
> > > > > > >
> > > > > > > mutex_lock(&mgr->lock);
> > > > > > > - send_remove = drm_dp_mst_port_downstream_of_branch(payload->port, mgr->mst_primary);
> > > > > > > + send_remove = drm_dp_mst_port_downstream_of_branch(new_payload->port, mgr->mst_primary);
> > > > > > > mutex_unlock(&mgr->lock);
> > > > > > >
> > > > > > > if (send_remove)
> > > > > > > - drm_dp_destroy_payload_step1(mgr, mst_state, payload);
> > > > > > > + drm_dp_destroy_payload_step1(mgr, mst_state, new_payload);
> > > > > > > else
> > > > > > > drm_dbg_kms(mgr->dev, "Payload for VCPI %d not in topology, not sending remove\n",
> > > > > > > - payload->vcpi);
> > > > > > > + new_payload->vcpi);
> > > > > > >
> > > > > > > list_for_each_entry(pos, &mst_state->payloads, next) {
> > > > > > > - if (pos != payload && pos->vc_start_slot > payload->vc_start_slot)
> > > > > > > - pos->vc_start_slot -= payload->time_slots;
> > > > > > > + if (pos != new_payload && pos->vc_start_slot > new_payload->vc_start_slot)
> > > > > > > + pos->vc_start_slot -= old_payload->time_slots;
> > > > > > > }
> > > > > > > - payload->vc_start_slot = -1;
> > > > > > > + new_payload->vc_start_slot = -1;
> > > > > > >
> > > > > > > mgr->payload_count--;
> > > > > > > - mgr->next_start_slot -= payload->time_slots;
> > > > > > > + mgr->next_start_slot -= old_payload->time_slots;
> > > > > > >
> > > > > > > - if (payload->delete)
> > > > > > > - drm_dp_mst_put_port_malloc(payload->port);
> > > > > > > + if (new_payload->delete)
> > > > > > > + drm_dp_mst_put_port_malloc(new_payload->port);
> > > > > > > }
> > > > > > > EXPORT_SYMBOL(drm_dp_remove_payload);
> > > > > > >
> > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > > > > index f3cb12dcfe0a7..dc4e5ff1dbb31 100644
> > > > > > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > > > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > > > > > > @@ -526,6 +526,8 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
> > > > > > > to_intel_connector(old_conn_state->connector);
> > > > > > > struct drm_dp_mst_topology_state *mst_state =
> > > > > > > drm_atomic_get_mst_topology_state(&state->base, &intel_dp->mst_mgr);
> > > > > > > + struct drm_dp_mst_atomic_payload *payload =
> > > > > > > + drm_atomic_get_mst_payload_state(mst_state, connector->port);
> > > > > > > struct drm_i915_private *i915 = to_i915(connector->base.dev);
> > > > > > >
> > > > > > > drm_dbg_kms(&i915->drm, "active links %d\n",
> > > > > > > @@ -534,7 +536,7 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,
> > > > > > > intel_hdcp_disable(intel_mst->connector);
> > > > > > >
> > > > > > > drm_dp_remove_payload(&intel_dp->mst_mgr, mst_state,
> > > > > > > - drm_atomic_get_mst_payload_state(mst_state, connector->port));
> > > > > > > + payload, payload);
> > > > > > >
> > > > > > > intel_audio_codec_disable(encoder, old_crtc_state, old_conn_state);
> > > > > > > }
> > > > > > > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > > > > > > index edcb2529b4025..ed9d374147b8d 100644
> > > > > > > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > > > > > > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > > > > > > @@ -885,7 +885,7 @@ nv50_msto_prepare(struct drm_atomic_state *state,
> > > > > > >
> > > > > > > // TODO: Figure out if we want to do a better job of handling VCPI allocation failures here?
> > > > > > > if (msto->disabled) {
> > > > > > > - drm_dp_remove_payload(mgr, mst_state, payload);
> > > > > > > + drm_dp_remove_payload(mgr, mst_state, payload, payload);
> > > > > > >
> > > > > > > nvif_outp_dp_mst_vcpi(&mstm->outp->outp, msto->head->base.index, 0, 0, 0, 0);
> > > > > > > } else {
> > > > > > > diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h
> > > > > > > index 41fd8352ab656..f5eb9aa152b14 100644
> > > > > > > --- a/include/drm/display/drm_dp_mst_helper.h
> > > > > > > +++ b/include/drm/display/drm_dp_mst_helper.h
> > > > > > > @@ -841,7 +841,8 @@ int drm_dp_add_payload_part2(struct drm_dp_mst_topology_mgr *mgr,
> > > > > > > struct drm_dp_mst_atomic_payload *payload);
> > > > > > > void drm_dp_remove_payload(struct drm_dp_mst_topology_mgr *mgr,
> > > > > > > struct drm_dp_mst_topology_state *mst_state,
> > > > > > > - struct drm_dp_mst_atomic_payload *payload);
> > > > > > > + const struct drm_dp_mst_atomic_payload *old_payload,
> > > > > > > + struct drm_dp_mst_atomic_payload *new_payload);
> > > > > > >
> > > > > > > int drm_dp_check_act_status(struct drm_dp_mst_topology_mgr *mgr);
> > > > > > >
> > > > > >
> > > > > > --
> > > > > > Cheers,
> > > > > > Lyude Paul (she/her)
> > > > > > Software Engineer at Red Hat
> > > > > >
> > > > >
> > > >
> > > > --
> > > > Cheers,
> > > > Lyude Paul (she/her)
> > > > Software Engineer at Red Hat
> > > >
> > >
> >
> > --
> > Cheers,
> > Lyude Paul (she/her)
> > Software Engineer at Red Hat
> >
>
--
Cheers,
Lyude Paul (she/her)
Software Engineer at Red Hat
