Skip to content

drm/asahi: t6050: identify the M5 Max's 27.2 (26B123) G17C firmware (on #1650) - #2185

Draft
erikwb wants to merge 16 commits into
integration/aurorafrom
j716c/gpu-g17c-272
Draft

erikwb wants to merge 16 commits into
integration/aurorafrom
j716c/gpu-g17c-272

Conversation

@erikwb

@erikwb erikwb commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Problem

On the M5 Max (J716c, T6050 G17C), the driver refuses the 27.2 (26B123) GPU firmware before any GPU write because CONFIG_MAX only lists the 27.0 (26A428) build.

Stacked on #1650 (Thomas's K114/K116 26B8125 identity, itself on #1173's M5 27.2 InitData graph). This branch carries #1650's current head (e734a5bc1d5e) unchanged (including #1173's 10 third-party commits 2a7983c3462d..d8ca53c82e52, untouched per authorship rules), then our commit (e6d2b6f06d90), then a clean merge of current integration/aurora (ffe545f423d3). Keep as Draft / merge only after #1173 (with its commit trailers cleaned) and #1650 land, at which point our single commit will be rebased cleanly onto integration/aurora.

Change

Testing

At head d8ad1c90969e (stacked on #1650 e734a5bc1d5e, merged with integration/aurora ffe545f423d3):

  • Build (ARCH=arm64 LLVM=1, Rust 1.99.0, CONFIG_DRM_ASAHI=y, CONFIG_DRM_ASAHI_M5=y, CONFIG_DRM_ASAHI_G18=y, CONFIG_KUNIT=y): drivers/gpu/drm/asahi/ compiled cleanly with 0 errors and 0 warnings from hw/t6050.rs or fwid.rs.
  • Host tests (run-host-tests.py): g17 suites 90/90 PASS (including g17-firmware-selection-tests and g17-telemetry-integration-tests + all mutations), asahi-m4 1/1 PASS, hardware-defaults-tests 1/1 PASS.

Prior hardware and KUnit runs (earlier head 5f445b4fc593/d3bad3d97976 on J716c with #1956, #1957, #2162, #2177):

  • J716c (M5 Max, 128 GB):
    • 27.2 stub: GPU firmware build: 26B123 for T6050 G17C, both InitData roles acknowledged, Hyprland composites, vulkaninfo reports Apple M5 Max (G17C B1), Vulkan coherency test passes (0 wrong words over 8 iterations), glmark2 runs; no GPU fault or recovery.
    • 27.0 stub: 26A428 for T6050 G17C as before, desktop runs.
  • KUnit (asahi_fwid, arm64 QEMU): 10 passed, 1 skipped (j713_accepts_all_loaded_images, CONFIG_DRM_ASAHI_G16=n).

Still to run

Assisted-by: LLM (Anthropic:Claude Opus 5.5, Google:Gemini 4 Neon, OpenAI:GPT-6.2 Sol)

…cannot build

From macOS 27.2 on, the M5 GPU firmware expects a different InitData
graph than the 26A428 (27.0) one the M5 path builds:

- the root version word gains bit 46 (0x0c8e_0339_8728_04c0 ->
  0x0c8e_4339_8728_04c0), in 27.2 and 27.3 alike;
- the power policy grows from 0x126b0 to 0x12728 bytes and the status
  config from 0x780 to 0x790, in 27.2 and 27.3 alike;
- 27.3 beta 1 alone inserts a HW data word at 0x2720.

These layouts are not yet confirmed from captured InitData of a
running macOS; the later commits of this series say which parts a
running firmware has accepted.

Name the layouts a build needs (Variant::m5_layouts) and give the 27.2
firmware its own variant, V26B123_M5: the 26A428 M5 protocol with the
26B123 layouts. Until the M5 graph builds them, Gpu::new() refuses such
a build right after identifying it, before anything is written to the
GPU, instead of handing it a graph it would reject ("Host and FW
Interface is mismatched") or misread.

Every M5 build in the tree today is 26A428 and names
M5Layouts::V26A428, so nothing changes for the M5 Max and M5 Ultra.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
…uilds

The M5 Pro admits only the 27.0 (26A428) G17S build. Pin the 27.2
(26B123) and 27.3 beta 1 (26C5035r) G17S builds of both roles as well,
measured the way fwid defines a build (the SHA-256 of the primary's
then the secondary's TEXT with the entropy records, the two header
load fields and the two boot-argument sections of each role zeroed):

  27.3 beta 1 (26C5035r)  b5537c8f06bd...66763600
  27.2 (26B123)           2b4613c62a8a...913f0fd9

The images are the G17S (FW Build variant a010) primary and secondary
GFX firmware of the public Mac17,8 IPSW for 27.2 and of the 27.3 beta
1 restore bundle (im4p SHA-256 ae7f35b1... and da8ff3fb...). The
offsets come from each image's Mach-O load commands: text at 0x50000 +
0x54000, DATA 0x184000 as on the M5 Max, the _rtk_tunables and
_rtk_patchbay sections per role. 27.2 needs an entry
of its own although its interface matches 27.3's: its primary entropy
record sits at 0x49ea4, 27.3's at 0x49eac. Each image header still
carries its load fields at 0x224/0x23c (zero in the file, the
patchbay's offset and size at 0x22c/0x230, as in 26A428).

The 27.0 entry is the one the base already pins: this digest procedure
gives the same digest for it, and reproduces the two pinned 26A428
digests of the M5 Max (G17C) and M5 Ultra (G17D).

27.0 runs the 26A428 graph. 27.2 and, for now, 27.3 name V26B123_M5,
whose layouts the M5 graph does not build yet, so they are identified
and then refused before any GPU write; 27.3 gets its own variant once
its HW data is built. The fwid KUnit tests cover the new builds.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
The M5 GPU firmware of macOS 27.2 (26B123) is expected to find a
different root version word than 27.0 (26A428):
0x0c8e_4339_8728_04c0 where 27.0 has 0x0c8e_0339_8728_04c0, only bit
46 differs.

Its allocation size table differs from 26A428's
(ABI_ALLOCATION_SIZES_26A428_M5) in two entries only:

  index 4,  power policy:  0x126b0 -> 0x12728
  index 13, status config: 0x780   -> 0x790

The packed layouts derived from it move accordingly: in the shared
cluster everything after the policy moves by 0x80 (views 3 and 4, the
BRN table and repeated region, the twelve DM rings, both main configs
and control rings); in the private cluster everything after the status
config moves by 0x40 (both role sets with status A, the secondary
control state, secondary extra 1 and the policy state). Both clusters
keep their page-rounded sizes (0x34000 and 0x178000), so the fixed
windows of the M5 graph still hold them. The HW data of 26B123 is
26A428's.

The version word, the sizes and the HW data layout of 26B123 are not
yet confirmed from captured InitData.

Describe one firmware build's InitData layout as an M5Layout (its size
table, the packed clusters derived from it, and how its HW data moves
relative to the 26A428 encoding), add M5_LAYOUT_26A428 and
M5_LAYOUT_26B123, and a RootProfile J714G17S26B123 that writes the new
version word and takes its offsets from the 26B123 layout. build_m5()
now takes the firmware build's Variant and builds the profile its
M5Layouts names.

Gpu::new() keeps refusing every build but 26A428 until the 26B123
power policy and status config are laid out as well (later in this
series), so no firmware is handed a partly converted graph.

The 26A428 encodings are unchanged: the HW data of every board, the
private cluster, the bundle policy, both roots and both main configs
encode to the same bytes as before.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
The M5 firmware of macOS 27.3 beta 1 (26C5035r) takes the 26B123
version word and allocation sizes, but its HW data is not 26B123's:
one u32 is inserted at 0x2720 and every later field moves by 4 (the
kick-shared pointer from 0x27dc to 0x27e0, the last moved word from
0x2846 to 0x284a; everything below 0x2720 is as before). The version
word does not tell the two builds apart; only the firmware identity
does.

The new word is the time the GPU may take to reach a forced idle after
a sleep request, in ms; 0 disables the wait. The value written,
5000, is 5 s times 1000. The layout, the meaning of the word and the
value are not yet confirmed from captured InitData.

Describe the move with the layout bands the HW data already uses
(M5_26C5035_HW_DATA_BANDS: 0..0x2720 stays, 0x2720..0x284c moves by
4; the four bytes it drops past 0x284c are zero in the 26A428
encoding), apply them after the 26A428 encoding and write the word,
and find the kick-shared pointer and the enabled-core words through
them. Add RootProfile J714G17S26C5035, M5Layouts::V26C5035 and its
Variant V26C5035_M5, and have the 27.3 (26C5035r) G17S build of the
M5 Pro name it instead of V26B123_M5. The fwid KUnit test that checks
each M5 Pro build's layouts follows.

The encoded 26C5035r HW data of every board equals the 26A428
encoding below 0x2720, has 5000 at 0x2720 and carries the 26A428
bytes 0x2720..0x284c at 0x2724.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
The 26B123 M5 firmware takes a 0x12728-byte power policy instead of
0x126b0 (allocation size table entry 4); 27.3 beta 1 (26C5035r) has
the same layout. Five inserts, as bands in 26A428 offsets, move the
words above them:

  [0x0000, 0x4910)   +0
  [0x4910, 0x491c)   +0x10  two u64 words; the three controller input
                            words at 0x4910 (3500/1000/3000 in the J714
                            defaults) move to 0x4920
  [0x491c, 0x49b8)   +0x14  a controller input word at 0x492c
  [0x49b8, 0x4a98)   +0x18  4 bytes between 0x494c and 0x49b8 that the
                            M5 encoders do not write
  [0x4a98, 0x12668)  +0x30  0x18 bytes between 0x4a00 and 0x4a98 that
                            they do not write either
  [0x12668, 0x126b0) +0x78  the table at +0x122f0 grows from 37 to 40
                            24-byte entries

The state and AON PTD pointers move to 0x8284 and 0x11a4c. The 26B123
policy may use words of its own at 0x94e4..0x954c, in space the M5
encoders do not write in 26A428; they stay zero here.

The policy controller input words the 26B123 policy carries beyond the
26A428 ones are 0x492c = 5000 and 0x4a14 = 1600 (26A428 0x49fc, 500 in
the J714 defaults) for the core types 0x18/0x19, and for the G17D core
type 0x1a 0x4920 = 2500, 0x4928 = 800, 0x492c = 1100, 0x49e4 = 0 and
0x4a14 = 1600. These values and the bands above are not yet confirmed
from captured InitData; they are what a capture session has to check.

Add M5PolicyMap with the 26A428 identity map and the 26B123 map, chosen
from the build's M5Layouts (every layout but 26A428 takes the 26B123
map), and relayout_m5_policy(), which moves the bands of the policy the
26A428 encoders wrote in place, highest first, zeroes the inserts and,
where the board's controller defaults were applied, writes the 26B123
controller words for its core type. For 26A428 it changes nothing.

Not run on hardware: the controller words (they are written only where
the board's controller defaults apply, and no run of this layout has
had them) and the G17D (J775D) words on 26B123; no 27.2+ M5 Max or
M5 Ultra firmware is identified yet.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
The M5 graph's policy encoders (encode_m5_bundle_policy() and the
boards' controller defaults) write the 26A428 layout. Keep the build's
policy map in InitData, set through set_m5_policy_layouts() from the
identified firmware's M5Layouts, and lay the policy out for it in
build_m5() once the controller defaults have run: the 26B123 layout
moves every word above 0x4910 and adds the 26B123 controller words
where the board's defaults applied. The maximum-power word read for
region C (0xa18) does not move.

The relayout stays within the build's own policy allocation: a policy
larger than the space before block_68 of the shared layout is refused.
The diagnostic policy read is bounded by the build's policy size.

The map defaults to 26A428, so the 26A428 graph is unchanged.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
The 26B123 M5 firmware takes a 0x790-byte status config instead of
0x780 (allocation size table entry 13); 27.3 beta 1 (26C5035r) has the
same layout. Everything up to +0x5b4 keeps its offset. From +0x5b4 the
object holds two controller blocks, at +0x5b4 and +0x610, of 0x5c
bytes each. 26B123 inserts two words into each block, an override slot
at block +0x28 and its value at block +0x58, so a block grows to 0x64
bytes, and everything after the second block moves by 0x10: the link
word and pointer (0x774/0x778 -> 0x784/0x788) and the submission
history (0x73c/0x74c/0x750 -> 0x74c/0x75c/0x760).

As bands in 26A428 offsets: [0, 0x5dc) +0, [0x5dc, 0x608) +4,
[0x608, 0x638) +8, [0x638, 0x664) +0xc, [0x664, 0x780) +0x10. The new
words are 0x5dc and 0x640 (override slots, zero-filled) and 0x60c
(5000) and 0x670 (0), the values. The layout and these values are not
yet confirmed from captured InitData.

Add M5StatusConfigMap with the 26A428 identity map and the 26B123 map,
encode the primary status-B span through it, and read the submission
history through the map the graph was built with. The 26A428 status
config is unchanged: the map path writes the same 0x780 bytes as
write_relocated_words() with COMMON26_STATUS_CONFIG_BANDS. The 26A428
words the driver writes from 0x5a4 are not changed here; the 26B123
map moves them like every other word.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
Give RootProfile the status-config map of its M5 graph and have
build_m5() pick the profile before it encodes the private cluster, so
the status-B span, the link word and pointer and the submission-history
reader all follow the profile's layout. Every existing profile keeps
the 26A428 map, so the graph is unchanged.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
…3 profiles

The 26B123 (macOS 27.2) firmware takes the 0x790-byte status config:
two words more in each controller block and the tail, link word and
submission history 0x10 higher. Return M5_26B123_STATUS_CONFIG for the
26B123 root profile, and for the 26C5035 (macOS 27.3 beta 1) profile,
whose status config is the same as 26B123's.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
…e firmware build

build_m5() now selects the power-policy map from the same M5 layouts
the root profile comes from, so a 26B123 or 26C5035 firmware gets its
policy laid out to 0x12728 bytes and its 0x790-byte status config in
the same graph. The policy and status-config sizes of 26B123 are
entries 4 and 13 of its allocation size table, and a compile-time
check holds every M5 build's policy and status-config maps to its own
size table, with the policy at the offset the controller defaults
write it.

The controller defaults keep writing the 26A428 policy, which the
relayout then moves; name that slice once. The private cluster encoder
takes the root profile and derives both the cluster layout and the
status-config map from it, which leaves the 26A428-only status-B
wrapper without callers.

With every 27.2+ layout in place, Gpu::new() now refuses only a build
that names no M5 layouts, so the M5 Pro's 27.2 (26B123) and 27.3 beta 1
(26C5035r) builds run their graphs. 26A428 builds, the only ones the
M5 Max and M5 Ultra identify, take the identity maps and build the
same bytes as before this series.

The 27.2+ layouts and values of this series are not yet confirmed from
captured InitData; the comments say which. What has been observed is
the following. An earlier revision of this series, with J716s board
tables and a native-address mailbox compatible that are not part of
this one, ran on a J716s (16-inch M5 Pro) with the 27.3 beta 1 boot
firmware, a device tree that describes the GPU and a loader that hands
it over (none of them part of this series):

  aurora 2300000000.gpu: GPU firmware: 27.3 (26C5035r), G17S
  aurora 2300000000.gpu: RTKit: Initializing (protocol version 12)
  aurora 2300000000.gpu: M5 primary initdata acknowledged
  aurora 2300000000.gpu: M5 secondary initdata acknowledged
  aurora 2300000000.gpu: M5 firmware opening records retired
  [drm] Initialized aurora 1.0.0 for 2300000000.gpu on minor 1

with no coprocessor crash, SError, DART or UAT fault for the minutes
the system ran, and later through a 25-minute desktop session on the
GPU with no GPU errors. That shows the firmware accepting a graph
built from these layouts; it does not confirm any single value. Not
exercised: the 27.2 firmware on hardware, the forced-idle sleep path,
the policy controller words (that board wrote no controller defaults),
the M5 Max and M5 Ultra on 27.2+.

Signed-off-by: Rolando Trevino <rolotrealanis@gmail.com>
Assisted-by: LLM Claude
@RyanTheTide

Copy link
Copy Markdown
Contributor

No blockers.

This PR's own commit (50833fe) only adds the 26B123 G17C build to CONFIG_MAX (hw/t6050.rs:209-237). It names V26B123_M5, with the same records and boot-filled ranges as the G17S 26B123 entry (hw/t6050.rs:111-134), so build_m5() takes m5_graph(V26B123) exactly as it does for the M5 Pro, and an unmatched digest is still refused before any GPU write. t6050_admits_only_its_pinned_image (fwid.rs:548) already iterates CONFIG_MAX, so the new entry's ranges are checked. In the merge (19e76b6), every RootProfile arm in g17/fw/m5/initdata.rs:32-231 names its variants explicitly, with no _ => default, so J873G18G26B123 and J714G17S26B123 cannot fall into each other.

  1. fwid.rs:562-583: m5_pro_builds_name_their_layouts checks only CONFIG. Looping it over CONFIG and CONFIG_MAX would pin the new G17C entry to V26B123 too, along with the distinct-digest check.
  2. Attribution: commit 50833fe says "Developed with Claude Code." in its message, and the PR body ends with the Claude Code emoji line. Keep the commit to the human Signed-off-by, and end the body with Assisted-by: LLM (Claude:<model>). The stacked drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 commits carry Assisted-by: LLM Claude trailers as well; they need the same fix in drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 before this lands.
  3. The branch is now 402 commits behind integration/aurora. Because the merge commit reworks the shared J813 26B123 profile arms, it should be redone on the current base once drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650 is in.

HW row: J813 on the 27.2 stub with this head (the merge touches its profile arms): 26B123 common graph identified, desktop up, no GPU fault or recovery. Plus the J716c 27.2 row with regression counts: 0 AVC, 0 failed units, 0 new kernel errors.

Assisted-by: LLM (Claude:Opus 5.5)

axboe and others added 4 commits November 21, 2026 17:59
…14/K116

Applies on top of aurora-silicon/linux PR #1173.

The 16-inch M5 Pro OLED (K116s, Mac17,12) restores from the 27.2
(26B8125) image, not from the 26B123 image of the Mac17,8 that #1173
pins. Its a010 (G17S) firmware images carry LC_UUIDs that are the uuid
of the K116s ADT's iop-gfx-nub and iop-gfx1-nub (8A2891FC-D479-37E8-
895D-71B4D88ECB51, 58FF964E-F74B-31C2-8179-3837D6ADA9C2), so this is what
iBoot loads. TEXT 0x50000 + 0x54000, DATA 0x184000, the GKTS/ECAP
records and the _rtk_tunables/_rtk_patchbay sections sit at 26B123's
offsets, but the firmware identity digest differs:

  26B8125 G17S  af68d034a3f006b43dab661b825f12598cb86e4d2a0e3844f14fa5059f38f6cb
  26B123  G17S  2b4613c62a8a007f22a94101702c9ac6c4e90f2e123f3b36fbe6ffea913f0fd9

Without this entry the driver refuses the K116s firmware before any GPU
write.

It names V26B123_M5, the InitData of the 26B123 firmware, whose layout
this build shares. On the K116s both firmware roles accept that InitData
and run it: the machine has run this graph daily since mid-November.
The kernel logs "GPU firmware: 27.2 (26B8125), G17S", KWin, Plasma and
Xwayland render on the GPU ("Apple M5 Pro (G17S B1)") with no Mesa
environment variable set, and the GPU comes back after each deep sleep.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Keep the imported M5 firmware layouts and select their Graph through the current board graph path. Preserve common-26 J813 encodings and submission-history caching while relocating the 27.2 history fields.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
Integration now carries the J813's macOS 27.2 InitData (b70bc80,
through #2135): RootProfile::J873G18G26B123 and the 26B123 common-interface
layouts. This branch has #1173's M5 profiles J714G17S26B123 and
J714G17S26C5035 in the same matches. The resolution keeps both: every
match covers all seven profiles, #1173's m5_layout() early returns stay,
and the 26B123 common-interface arms are integration's. No original
commit is rewritten.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
The K116s 26B8125 entry named V26B123_M5 for what the 26B8125 kernel
side builds. State instead what the driver itself sees: the firmware's
records and sections sit at 26B123's offsets (the driver's boot-time
layout checks), and on the K116s both firmware roles accepted the
26B123 InitData and ran it (driver up, Vulkan, a Plasma session).

Comment only.

Signed-off-by: Thomas Glanzmann <thomas@glanzmann.de>
@erikwb
erikwb force-pushed the j716c/gpu-g17c-272 branch from 19e76b6 to d3bad3d Compare November 22, 2026 00:34
@erikwb

erikwb commented Nov 22, 2026

Copy link
Copy Markdown
Contributor Author

Note

🤖 Gemini 4 Neon responding on behalf of erikwb

Addressed items 1 and 2 in 5f445b4fc593 / d3bad3d97976:

  1. drivers/gpu/drm/asahi/fwid.rs: m5_pro_builds_name_their_layouts() now loops over [&CONFIG, &CONFIG_MAX], pinning the 26B123 G17C entry to M5Layouts::V26B123 and checking digest uniqueness across CONFIG_MAX builds (asahi_fwid KUnit on arm64 QEMU: 10 passed, 1 skipped).
  2. Attribution: stripped Developed with Claude Code. from the feature commit (5f445b4fc593), added Signed-off-by: Erik Bourget <erik@ebourget.net> to the recreated merge commit (d3bad3d97976), preserved all stacked drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173/drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650 commits (<= c6abd0b05187) unchanged, and updated the PR body footer to Assisted-by: LLM (...).
  3. Kept the existing merge structure while drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650 and drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 remain open (the branch still merges cleanly with integration/aurora); will redo the merge on current integration/aurora once drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650 lands. Added the J813 27.2 check and J716c 27.2 regression counts to Still to run.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Re-checked at d3bad3d.

No new issues in 5f445b4.

Rows still needed at this head: J716c on 27.2 with 0 AVC, 0 failed units and 0 new kernel errors, and J813 on the 27.2 stub (26B123 common graph identified, desktop up, no GPU fault or recovery).

Assisted-by: LLM (Claude:Opus 5.5)

@DjDeveloperr DjDeveloperr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review at d3bad3d97976: changes requested (blockers are in the stacked history targeting integration/aurora; your own commit 5f445b4fc593 and merge resolution logic have 0 code issues).

Checked (clean):

  • 5f445b4fc593: adds the 27.2 (26B123) G17C build to CONFIG_MAX (hw/t6050.rs) matching the G17S 26B123 records/ranges with its own digest, extends fwid.rs to check CONFIG_MAX alongside CONFIG, and carries human Signed-off-by: only.
  • d3bad3d97976: RootProfile arms in g17/fw/m5/initdata.rs explicitly separate M5 and common-26 profiles; verified t8142.rs uses V26A428_M5 (m5_layouts: Some(...)) and common26 skips M5 policy relayout/history so J813 is not rejected.
  • host-tests CI is green.

Blockers (cannot merge onto integration/aurora as-is):

  1. Commit attribution trailers in stacked #1173 commits (§4): Because this PR targets integration/aurora directly and is currently MERGEABLE, merging it would land 10 commits from #1173 (2a7983c3462d..d8ca53c82e52) that carry Assisted-by: LLM Claude trailers in their commit messages. Those trailers must be removed in #1173 first, and this PR rebased onto the cleaned stack.
  2. Superseded #1650 base and stale merge: This branch carries an older #1650 head (4ac2c69dd0b8 / c6abd0b05187) while #1650 has moved on to e734a5bc, and merges integration/aurora at 59b02d5e (~500 commits behind tip). Please restack/rebase onto current integration/aurora once #1173 and #1650 land (or onto the updated, clean #1650 head).

Non-blocking nit:

  • drivers/gpu/drm/asahi/fwid.rs:562: test function is still named m5_pro_builds_name_their_layouts now that it checks both CONFIG (M5 Pro) and CONFIG_MAX (M5 Max).

Hardware rows still needed on the rebased head (§5):

  • J813 on the 27.2 stub (since the merge touches shared RootProfile arms: 26B123 common graph identified, desktop up, 0 GPU faults/recoveries).
  • J716c 27.2 regression counts (0 SELinux denials, 0 failed units, 0 new kernel errors) and s2idle on 27.2.

Assisted-by: LLM (Gemini 4 Neon)

The 26B123 G17C build has the same interface (V26B123_M5) and the same
GKTS/ECAP records and boot-filled ranges as the 26B123 G17S build, with
its own digest. Without an entry the driver refuses the M5 Max's 27.2
firmware before any GPU write.

Add the build, with the digest of its TEXT with those ranges zeroed.
The same computation gives the existing 26A428 G17C pin and the 26B123
G17S one. Extend the fwid layout test in fwid.rs (renamed to
m5_builds_name_their_layouts) to check CONFIG_MAX alongside CONFIG so
the new G17C entry's layout variant and digest uniqueness are verified
too.

Signed-off-by: Erik Bourget <erik@ebourget.net>
Signed-off-by: Erik Bourget <erik@ebourget.net>
@erikwb
erikwb marked this pull request as draft November 22, 2026 07:45
@erikwb
erikwb force-pushed the j716c/gpu-g17c-272 branch from d3bad3d to d8ad1c9 Compare November 22, 2026 07:45
@erikwb

erikwb commented Nov 22, 2026

Copy link
Copy Markdown
Contributor Author

Note

🤖 Gemini 4 Neon responding on behalf of erikwb

Restacked on #1650's current head (e734a5bc1d5e), merged current integration/aurora (ffe545f423d3), and fixed the fwid.rs test-name nit (new head d8ad1c90969e):

  1. Updated stack & fresh merge: Replayed our commit (e6d2b6f06d90) on top of drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650's latest head (e734a5bc1d5e) and merged current integration/aurora (ffe545f423d3) cleanly with zero conflicts (d8ad1c90969e). Both commits carry only human Signed-off-by: Erik Bourget <erik@ebourget.net>.
  2. drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 commit trailers (§4): The 10 stacked commits from drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 (2a7983c3462d..d8ca53c82e52) are third-party commits still open in draft drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 with Assisted-by: LLM Claude trailers; per §4 ("Carry other people's commits unchanged"), we did not rewrite them. This PR should stay Draft until drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 strips those trailers and drm/asahi: M5: InitData for the macOS 27.2 and 27.3 firmware (G17S bring-up on J716s) #1173 + drm/asahi: t6050: identify the K114/K116 27.2 (26B8125) G17S firmware (on #1173) #1650 land, at which point we will rebase our single commit directly onto integration/aurora.
  3. Nit fixed: Renamed m5_pro_builds_name_their_layouts() to m5_builds_name_their_layouts() in drivers/gpu/drm/asahi/fwid.rs (e6d2b6f06d90) now that it verifies both CONFIG and CONFIG_MAX.

Verified on d8ad1c90969e: ARCH=arm64 LLVM=1 build of drivers/gpu/drm/asahi/ (CONFIG_DRM_ASAHI_M5=y, CONFIG_DRM_ASAHI_G18=y, CONFIG_KUNIT=y, Rust 1.99.0) passed with 0 errors and 0 warnings from hw/t6050.rs/fwid.rs; run-host-tests.py passed 90/90 g17, 1/1 asahi-m4, and 1/1 hardware-defaults-tests. Hardware rows (J813 27.2 and J716c 27.2 regression counts + s2idle) remain in Still to run.

@RyanTheTide

Copy link
Copy Markdown
Contributor

Re-checked at d8ad1c9.

Since the RootProfile arms now come from #1650's own merges, a J813 27.2 row at #1650's head covers this PR as well. The row this PR still needs for itself is the J716c on 27.2 at this head (0 AVC, 0 failed units, 0 new kernel errors), plus a rerun of the asahi_fwid KUnit suite, since only the build and host tests ran at d8ad1c9.

Assisted-by: LLM (Claude:Opus 5.5)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants