Repository navigation
drm/asahi: g17: four-cluster tiling PTC cap as macOS writes it - #2171
AxxzyWasTaken wants to merge 5 commits into
Conversation
|
The production boot stub pins at macOS 27.2 (26B123), so please retarget this to 27.2. The tiling PTC cap here comes from the 26.6.2 (25G83) GPU firmware; please take it from the T6041 GPU image the 27.2 stub loads. |
bc3e8e9 to
7da6f6f
Compare
T6041 ran its 25G83 tiling passes in TA mode 1 (0x1c890 = 1), which tiles non-clustered: one of the four clusters runs the tiling and vertex work of a pass. Vertex shaders reached a quarter of the ALU rate of the GPU (2.95 vs 12.3 TFLOPS), and geometry-bound games were capped by it. Tile clustered instead, with what a four-cluster pass needs: - Clustering metadata sized for more than two clusters, as the M2 Pro/Max path sizes it (meta1 per block of tiles, meta2-4 fixed). - The four-cluster segment words of cluster_control(): 0x1c890 = 0x280540, 0x1c918 = 4, and 32 + 16 x clusters = 0x60 free parameter buffer pages in 0x1c9a8. The two-cluster capture (0x200440 / 4 / 0x3c) stays for two clusters. - A per-build tiler heap normal maximum: the four-cluster 25G83 build may use every slot of the block table. A clustered RD32 Minecraft frame needs about 1600-2200 blocks; at the 0x45e normal maximum the pass never starts and the firmware recovers with reason 0. 25F84 keeps TA mode 1, and every other build keeps its values. Measured on the J616C (32-core M4 Max, 25G83): vertex-shader ALU 2.95 -> 10-11.5 TFLOPS; Sodium-style terrain 1.93 -> 0.68 ms per frame with identical images; Minecraft RD32 105 -> ~300 fps, with no GPU recoveries over several sessions, heavy and concurrent stress included. G17 host tests 31/31. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
With four-cluster tiling the 32-core M4 Max runs vertex shaders on every cluster at once. Roblox (Vulkan) then hangs the GPU about once a minute: the firmware kills a small depth/stencil render as no-progress (reason 0), with no MMU fault and a nearly empty tiler heap. The same hang showed up on this Mac with the earlier driver until its render pool had 96 blocks. Give firmware variants a smallest render pool, 44 blocks as before, and 96 for T6041 25G83. Owners grow to it on their first render, as they grow for ray-query scratch. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
…them macOS 26.6.2 on the 32-core M4 Max (25G83), captured under a hypervisor while running a game, spaces a clustered pass's tiler metadata 2, 3 and 4 0x1180, 0x1400 and 0x1600 apart and writes 0x5c free parameter-buffer pages. Metadata 2 was 0xc00, the M2 Pro/Max size, so the tiler could write past it into metadata 3. Use 0x1180 and 0x5c; metadata 3 and 4 keep their larger sizes. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
Four-cluster passes size clustering metadata 1 as the M2 Pro/Max path does, 0x44 bytes per block of tiles, with 0x80, the two-cluster M4 Pro size, as the floor. Metadata 1 is the last sub-buffer, and the macOS 26.6.2 capture on the M4 Max does not show its size. Give it a 16 KiB floor instead. The per-block size stays the M2 Pro/Max formula; the floor is our own choice, not a macOS value. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
0x0a5a1 carries the tiling PTC cap in bits 32 and up. The 25G83 array wrote 0x60, the two-cluster M4 Pro value. macOS 26.6.2 on the 32-core M4 Max writes 0x7f, 0x97 or 0xaf for its passes. Give clustered four-cluster passes 0xaf, the largest of those. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
7da6f6f to
845bd7f
Compare
|
Blockers: 2.
Also checked: HW row: J616C (M4 Max), this commit rebased on the landed #2021 and booted as-is, same-Mac A/B with Assisted-by: LLM (Claude:Opus 5.5) |
Depends on #2021. This branch sits on #2021's branch, so GitHub shows #2021's four commits first; only the last commit belongs to this PR. I'll rebase it once #2021 lands.
0x0a5a1carries the tiling PTC cap in bits 32 and up. The 25G83 tiling array writes0x60there, the two-cluster M4 Pro value. In my macOS 26.6.2 (25G83) capture on this J616C, taken under a hypervisor while macOS ran a game, the clustered passes have0x7f,0x97or0xafthere. This gives clustered four-cluster passes0xaf_0040_0020, the largest of those. TA mode 1, two clusters and other builds keep0x60.I don't know how macOS picks among the three values per pass, so taking the largest is my own choice.
Testing
All on a J616C (32-core M4 Max), 25G83:
0x60failed the same way, so it isn't that failure's cause either.M=drivers/gpu/drm/asahi), not booted as-is.tools/asahi/run-host-tests.py --only g17: 90/90. I couldn't run KUnit (no QEMU here).Assisted-by: LLM (Anthropic:Claude Opus 5.5)