Repository navigation
thunderbolt: apple: let T6020 DP IN tunnels wait for a display pipeline - #2790
Draft
RyanTheTide wants to merge 1 commit into
Draft
RyanTheTide wants to merge 1 commit into
RyanTheTide wants to merge 1 commit into
Conversation
apple_dpin_m2, the T6020/T6021 (M2 Pro/Max) ACIO policy, leaves
capacity_retry off "pending M2 hardware qualification". A DP IN tunnel
that finds no free display pipeline gets -EBUSY once and that is final
("dpin0: DP tunnel setup failed: -16"). The connection manager keeps
the tunnel through the DPRX timeout (TB_HOST_DP_KEEP_DPRX_TIMEOUT), but
nothing asks for a pipeline again, so the display stays dark.
On a MacBook Pro 16" M2 Pro (j416s) with a monitor on a Thunderbolt
cable and a TV on a USB-C to HDMI adapter (DP Alt Mode), the fabric
moves the TV to dcpext1 at boot and gives the tunnel dcpext0. After a
system resume the TV comes back first on dcpext0 and the tunnel's
request is refused. The fabric moves the TV to the other pipeline
a few seconds later, too late for a request that is not retried.
Set capacity_retry on apple_dpin_m2. A refused tunnel then waits as on
M1: the DP IN work arms its retry and routes the tunnel once a pipeline
comes free. M2 needs no dp_tunnel_awaits_display hook, which is set up
for the APPLE_DPIN_CHANGED flow only: KEEP_DPRX_TIMEOUT already keeps
its tunnels. As on M1, -EAGAIN waits too: an attempt that prepare cut
short returns it and has to ask again after complete. A DCP service
that is never published then waits until unplug, with a 120 s readiness
wait per retry, where it used to fail once.
Pause these retries across system sleep and at NHI removal. The PM gate
(apple_dpin_pause_retries(), apple_dpin_resume_retries(),
apple_dpin_end_pm_gate()) now applies wherever the policy has
capacity_retry or defer_new_bringup, not defer_new_bringup only.
apple_nhi_prepare() already pauses the retries of a gated policy on
every sleep, so a waiting M2 tunnel stops asking at prepare, as M1 and
M3 do. Its pause ends when complete starts, before tb_domain_complete():
every device has resumed by then, and the tunnel that the domain's
complete brings back makes its first attempt there, since M2 does not
defer it. Its retries then run from the refusal on, as before, and do
not wait for the end of complete, which can take seconds. Policies with
defer_new_bringup (M1, M3 and later) still resume after
tb_domain_complete(), as before. Without the gate a waiting M2 tunnel
would keep calling into appledrm on the non-freezable dp_wq while the
DCPs power off, and after the NHI is removed. M2 does not get
defer_new_bringup: that would defer every first M2 handoff across sleep,
which has not been tested, and DPRX retention for a deferred handoff
goes through the hook M2 does not install.
apple_dpin_end_pm_gate() now pauses both adapters before it drains
them, as apple_dpin_pause_retries() does: work in flight at NHI removal
could otherwise get -EBUSY and rearm the retry it had just cancelled.
On M1 this is the only change: a bring-up in flight at NHI removal is
deferred and then dropped instead of attaching. Base M2 (T8112) uses
apple_dpin_m1, and M3 is unchanged.
Update the comments above apple_dpin_work_fn() and
apple_dpin_pause_retries(), which named M1-family hosts. Tests: the M2
row of apple_dpin_all_policy_fields; the t602x rearm trace, whose -EBUSY
now waits and recovers; the capacity trace run for M2 as well; terminal
errors end an M2 wait; apple_dpin_m2_capacity_suspend (pause, resume, a
refusal after the pause has ended, resume with no pause, -EAGAIN under
pause, unplug while waiting, end of the gate).
In omacom/linux-aurora, commit 068fd09 ("thunderbolt: apple: let
T6030 DP IN tunnels wait for a display pipeline") restores the same
flag for M3 after the #139 merge dropped it; M2 never had it.
Testing: j416s, DCP firmware 13.5, under the m1n1 hypervisor,
pm_test=platform, with a bench-only DT change that keeps the
hypervisor's USB-C port out of the DCP routes. Monitor and TV: the
monitor came back after 6 of 6 resumes with this change (0 of 2 without,
on aurora 7.3 ac6b017, same thunderbolt and appledrm code), routed
6.2-6.5 s after the refusal and 3.4-3.8 s ahead of the DPRX timeout; no
DPRX timeout, no kernel WARNINGs. Monitor alone: back after 4 of 4
resumes, no wait. KUnit apple-dpin-lifecycle 35 of 35.
Not tested: natively, a suspend while a tunnel waits (KUnit only),
j414s, j414c, j416c, other firmware, a wait past the DPRX timeout, NHI
removal while waiting.
Signed-off-by: nekolyanich <me@nekolyanich.com>
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
A T6020/T6021 DP IN tunnel can hit a busy display pipeline after resume. The connection manager keeps the tunnel through the DPRX timeout, but the monitor stays dark because no retry is scheduled.
Change
Enable capacity retries for T6020/T6021. The existing sleep prepare path pauses retries for gated policies. On a full wake, non-deferred policies resume before the Thunderbolt domain completes, while deferred policies resume afterward. NHI teardown pauses the adapters before draining work so an in-flight attempt cannot rearm a retry.
Supersedes #2636. Thanks to nekolyanich for finding, fixing and testing the issue.
Testing
Arm64 KUnit at
921e43db230d8: 37/37 DP IN lifecycle tests passed. Across both Apple suites, 39 passed and one unrelated mailbox test was skipped. Host-test CI passed.Still to run
Native T6020/T6021 dual-display resume on the default command line, plus boot, resume and active-tunnel NHI unbind/rebind regression rows on T8112 and a deferred-policy host.
Earlier hardware qualification
The earlier J416s hypervisor run exercised Thunderbolt and USB-C/HDMI displays together and recovered the monitor after 5 of 5 resumes across three boots, with 0 DPRX timeouts. This used a test DT and
pm_test=platform. The native qualification will exercise real s2idle and report DPRX timeouts, SELinux denials, failed units and new kernel errors.Assisted-by: LLM (Claude:Opus 5.5)