Repository navigation
drm: apple: dcp: V27 sleep: take messages that come during the settle (J714s -16 refusal) - #2602
Merged
DjDeveloperr merged 1 commit intoNov 21, 2026
Conversation
On the J714s the panel's display processor (48ae00000.dcp) refused a deep sleep with -EBUSY and no reason in the log, 3 times in 40 sleeps that came after a replug of a display's port. Each refused sleep then left a GPU "firmware never stopped" line, and one an external display's link timeout, in the aborted resume. The refusal is the settle's last check. After the endpoint checks it took a snapshot of the RTKit receive side and refused the sleep if anything was in flight. Each refusal came ~5 ms after the panel's firmware logged a brightness change. It logs one each time an external display processor, suspending at the same time, releases its display, so a syslog line in flight at that instant was enough. macOS answers what the firmware sends during its display sleep and goes on. In a trace with three displays attached, its first stop request to the panel follows its answer to the panel's last syslog line by 31 us. The settle now does the same: when a message came during the checks, it is taken and all of them run again, including the inventory of messages left unhandled. A processor that still sends after 1 s, or a check that times out after such a message, refuses the sleep with -EBUSY as before, so the refusal is still undone cleanly. A refused sleep of the internal processor also logs its steps now, as the external ones' always do; a step's refusal there was silent. Signed-off-by: Diljit Singh <hey@djdev.me> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
DjDeveloperr
force-pushed
the
djdev/m5-j714s-dcp-settle-aop-order
branch
2 times, most recently
from
November 20, 2026 20:13
0fe7c29 to
af33408
Compare
Contributor
|
The loop makes sense to me, and running the inventory again after the last drain covers the earlier review point. Two things:
Assisted-by: LLM (Claude:Opus 5.5) |
Contributor
Author
|
Hardware gate (J714s, M5 Pro), pe1, 20:06-20:27: 6 of 6 clean.
The refusal this fixes came 3 times in 40 replug sleeps on the old code, so 6 clean sleeps are a gate, not a proof. More cycles follow after the merge, in the gates this rides. 🤖 Generated with Claude Code |
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.
A J714s (M5 Pro) deep-sleep fix, copied from macOS 27 traced under the hypervisor on the same machine. On
integration/auroradf62a8c.drm: apple: dcp: V27 sleep: take messages that come during the settle.
apple_rtkit_v27_rx_drained() ? 0 : -EBUSY). It is the only silent -EBUSY in the internal processor's path: the polls before it time out with -110, and every other refusal logs.An independent review (two rounds) found two issues in the first version, both fixed here: the inventory ran only once, and a timeout after a late message returned -ETIMEDOUT, which marks the processor crashed instead of undoing it. An AOP endpoint-order commit was in the first version and is dropped. The J714s device tree already gives the AOP macOS's stop order, so it fixed nothing on the J714s.
Hardware (J714s).
m5-test/sleepship-gate1-20261120(4dae773 = this base + usb: typec: tipd: sn201202x: J714s: enter and leave a sleep as macOS does #2597/usb: typec: tipd: cd321x: J714s: SSPS and USBw at a cable change, as macOS does #2598/usb: typec: tipd: sn201202x: J714s: arm USB wake after the PHYs' stop, as macOS does #2601/soc: apple: rtkit: give the saved scope's AP IDLE up to 10 s #2599/usb: typec: tipd: debugfs: a replug of the port's partner on request #2600) plus this commit, asm5-test/kitS2-20261120.🤖 Generated with Claude Code