Repository navigation
drm/asahi: g17: J716c deep sleep - #2131
Merged
Merged
Conversation
This was referenced Nov 17, 2026
erikwb
marked this pull request as draft
November 17, 2026 15:06
…0 suspend On the T6050 the GPU's sleep step only closes publication and waits for quiet; the firmware is stopped by the sleep's commit. A suspend refused after that step, with no firmware resume, must not touch that session: marking it lost or releasing it would let the runtime worker stop the firmware, or power the GPU down, while the machine never slept. On the T6050, a cancelled sleep step now keeps the session owned and only reopens publication once the preparations have drained. A step that cannot drain, or a crashed GPU, keeps the session as it is with a warning. A second sleep step while one is still in place is refused, and a GPU that reports no device or a crash during the step is not treated as already down. The resume after a suspend that never reached a firmware resume leaves the session alone. Other G17 GPUs keep their previous behaviour. Developed with Claude Code. Signed-off-by: Erik Bourget <erik@ebourget.net>
On the J716c the GPU took the generic G17 commit stop, which reads the firmware's mailboxes whatever GFX's power word reads. Between jobs, under automatic power, that word can read off with the firmware still running, and the read then takes a synchronous external abort inside the sleep's last steps. Take the J714s's M5 stop there too: it raises GFX out of automatic power before the idle, reports and only lowers a GFX that is off, and leaves the gating and bridge words alone. The J716c's GPU node has the one power domain the M5 path resolves (GFX, a PMGR power word) and no PMP request, so its power word and the PMP request it withdraws are unchanged. Developed with Claude Code. Signed-off-by: Erik Bourget <erik@ebourget.net>
erikwb
force-pushed
the
j716c/asahi-sleep
branch
from
November 17, 2026 15:09
8c90a6a to
541d9be
Compare
…drain An invalidated preparation can still be outstanding when a precommit cancel reaches its bounded drain limit. Arrange a software-only poll retry so the retained session can reopen publication after the last invalidated lease drains. Keep publication closed on failure, removal, an armed commit, or expiration of the bounded retry. Signed-off-by: Diljit Singh <hey@djdev.me>
Retain the tested production changes and use the ext26 cold-boot fixture revision that landed in integration. Signed-off-by: Diljit Singh <hey@djdev.me>
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.
What this does
publication is reopened only once the preparations have drained, nothing powers the GPU down or
stops its firmware, and a second sleep step while one is in place is refused. Other G17 GPUs keep
their previous behaviour.
a GFX that is off is lowered) instead of the generic G17 one, whose mailbox reads could take a
synchronous external abort in the sleep's last steps.
Tested
j716c/asahi-sleep) builds on its own base (Image.gz, modules and dtbs, arm64, LLVM).integration/aurorawere built as one kernel and run on a J716c (16" M5 Max): one suspend-to-RAM with a USB4 dock attached, about 30 s asleep, woken by the RTC alarm (wake source 76). After the wake all 18 CPUs were online, the dock's router came back in place with its Ethernet up, and the SEP answered RNG reads. The sleep's log showed "secondary clusters down first: cores 6+6, cluster 1 0x1a in 353 us, cluster 2 0x1c01a in 448 us". The PMP was not running in that build.Dependencies
Branch #2131 (
j716c/asahi-sleep). Based onintegration/aurora; no dependencies at build time. At run time the J716c deep sleep needs #2119 (j716c/sleep-j716c-profile) and #2123 (j716c/dts-deep-sleep).Part of the J716c deep sleep set: #2118 (
j716c/spin-table-release-cpus), #2119 (j716c/sleep-j716c-profile), #2120 (j716c/sleep-wake-source-names), #2121 (j716c/sleep-sep-auto-wake), #2122 (j716c/sep-t6050-profile), #2123 (j716c/dts-deep-sleep), #2124 (j716c/drm-apple-sleep), #2125 (j716c/dart-sleep), #2126 (j716c/thunderbolt-sleep), #2127 (j716c/usb-sleep), #2128 (j716c/phy-sleep), #2129 (j716c/pcie-sleep), #2130 (j716c/aic-sleep), #2131 (j716c/asahi-sleep), #2132 (j716c/spmi-sleep), #2133 (j716c/macsmc-sleep), #2134 (j716c/nvme-sleep).🤖 Generated with Claude Code