Repository navigation
arm64: dts: apple: t6050: describe the GPU on J714c, J873s, K114s, K116c - #2276
Draft
RyanTheTide wants to merge 4 commits into
Draft
RyanTheTide wants to merge 4 commits into
RyanTheTide wants to merge 4 commits into
Conversation
t6050-k114c-gpu.dtsi and t6050-k116s-gpu.dtsi describe the GPU in the same G17S layout: the gpu alias, six loader-filled reservations, the GFX and GFX1 mailboxes in place of the inventory ASC nodes, the always-on GPX and AFR states and the sgx override. Only one property differs per board (K114c keeps GFX on across s2idle, K116s puts the GPU on its PMP report entry). Move the common part into t6050-gpu-g17s.dtsi so other M5 Pro boards can use it. Both boards keep their own notes and their one board property. The K116s ADT reference values move to the file header unchanged. No functional change: the K114c and K116s DTBs are byte-identical before and after. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
The M5 Max GPU description in t6050-j716c-gpu-panel.dtsi (the GPU node under /soc@2300000000, its mailboxes, reservations, operating point tables and GPU power states) has nothing J716c-specific in it: every value is either the SoC's or left zero for the loader to fill from the ADT. Move that half into t6050-gpu-g17c.dtsi and include it from the J716c file, which keeps the internal panel half. Let a board that has no GPU bus of its own ask t6050-peripherals.dtsi for one with T6050_GPU_BUS, so the GPU PMGR lands under /soc@2300000000 where the loader looks for it, as on J716c. No functional change: no board defines T6050_GPU_BUS yet and the J716c DTB is byte-identical before and after. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
These four boards inherit the inventory GPU node from t6050-peripherals.dtsi, compatible "apple,agx-t6050". Neither drm/asahi (which matches "gpu,t6050" and "apple,agx-g17s") nor the loader's GPU handoff (which looks for "apple,agx-g17s", or "apple,agx-g17c" under /soc@2300000000) accepts it, so the GPU never binds on them. Describe the GPU as on the booted boards of the same part: - J714c and K116c (M5 Max): t6050-gpu-g17c.dtsi, as J716c, on its own /soc@2300000000 bus (T6050_GPU_BUS). J714c already runs its PMP, so its GPU stays on the PMP's GFX report entry as before. - J873s and K114s (M5 Pro): t6050-gpu-g17s.dtsi, as K116s and J714s. Nothing here is per board: the driver picks its configuration from the GPU's ID registers, the loader fills the reservations and operating points from the ADT the Mac boots with and checks the firmware build before it enables anything. Everything stays disabled until it does, so a loader that refuses leaves these boards as they are now. No other board's DTB changes. Not yet booted on any of the four. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
This was referenced Nov 19, 2026
opp-v2-base.yaml allows one suffix after opp-table, so opp-table-gpu-afr and opp-table-gpu-cs fail CHECK_DTBS. J716c already carried those warnings; sharing the block with J714c and K116c would add the same four on each board. Rename the nodes to opp-table-afr and opp-table-cs. Nothing looks them up by name: drm/asahi and the loader follow the GPU node's apple,afr-opp and apple,cs-opp phandles. 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
J714c, J873s, K114s and K116c inherit the inventory GPU node from
t6050-peripherals.dtsi(sgx, compatibleapple,agx-t6050). drm/asahi only matchesgpu,t6050andapple,agx-g17s(drivers/gpu/drm/asahi/driver.rs), and the aura GPU handoff only takesapple,agx-g17s(main,kboot_gpu.c) orapple,agx-g17cunder/soc@2300000000(aura#281). So the GPU never binds on these four boards.Change
t6050-j716c-gpu-panel.dtsiunchanged intot6050-gpu-g17c.dtsi. A board with no GPU bus of its own definesT6050_GPU_BUS, andt6050-peripherals.dtsithen puts the GPU PMGR under/soc@2300000000, the same as on J716c. J714c already runs its PMP, so its GPU stays on the PMP's GFX report entry (pmp0_gfx), as before.t6050-gpu-g17s.dtsi, and the K114c and K116s files keep only their notes and their one board property.Nothing in this is per board. The driver picks its configuration from the GPU ID registers (
hw/t6050.rsconfig()). The loader fills the reservations and operating points from the ADT the Mac boots with, and it checks the firmware build before it enables anything. Until then everything stays disabled, so a loader that refuses leaves these boards as they are today.Testing
opp-table-gpu-cs/opp-table-gpu-afr, which the opp-v2 node-name pattern rejects. Renaming them would change the J716c DTB, so I left that for a follow-up. The loader finds them by phandle (apple,cs-opp,apple,afr-opp), not by name.Still to run
None of the four boards has been booted with this. Owners, could you post a boot row?
dmesg | grep -i -e asahi -e agxand the aura log lineFDT: GPU: ....FDT: GPU: ...enabled, then drm/asahi probes with the M5 Max configuration on 27.0.Details
Per board:
t6050-gpu-g17c.dtsi(J716c), GPU onpmp0_gfx/soc@2300000000/gpu@2302600000,apple,agx-g17c)apple,agx-g17sfallback, ID registers selectCONFIG_MAXt6050-gpu-g17c.dtsi(J716c)t6050-gpu-g17s.dtsi(K116s/K114c)dt_set_gpu_t6050(aliasgpu,apple,agx-g17s, firmware digest)apple,agx-g17s, ID registers selectCONFIGt6050-gpu-g17s.dtsiWhat these boards still depend on is the firmware build, not the board. The kernel admits 26A428 (27.0) for G17S and G17C. 27.2 is in #1173/#1650 (G17S) and #2185 (G17C). aura main has digests for 26A428 and 26B8125 (G17S). An unknown build is refused and the GPU stays disabled.
Two things are shared per variant rather than read per part. The driver's M5 Pro/Max controller defaults and perf tables are the J714/J716C ones, applied on every part (#2080). Fused-off cores are covered by the per-variant core layout. Both are the same today for K116s/K114c (Pro tables) and J716c (Max tables).
On aura main, a G17C tree without a
gpualias (J714c, K116c after this change, and J716c today) skips the GPU handoff and the GPU stays disabled. aura#281 adds the path-based Max handoff.dtc before/after, normalized diff (phandles resolved to paths): the J873s/K114s GPU nodes match K116s's minus its PMP link, and the J714c/K116c
/soc@2300000000subtree matches J716c's minus J716c's sleep properties (apple,sleep-ps-auto, GFX always-on fromt6050-j716c-sleep-full.dtsi).Assisted-by: LLM (Claude:Opus 5.5)