Repository navigation
apple: t6041: firmware-27 XRGB alpha fix and #1954 follow-ups - #2492
DjDeveloperr merged 4 commits into
Conversation
Like T8142 on firmware 27 (43f8980), T6041 internal and external display processors running macOS 27.2 firmware (DCP_FIRMWARE_V_27_0) ignore is_premultiplied and blend the fourth byte of a DCP_FORMAT_BGRA (XRGB8888) surface as straight alpha. On AGX, PIPE_FORMAT_B8G8R8X8_UNORM leaves the 2-bit PBE Swizzle A selector at channel 0 (Red), storing X = R in DRAM and multiplying every displayed pixel by R / 255 — turning R = 0 blues and cyans black while screenshots look right. Extend xrgb_is_alpha to apple,t6041-dcp and apple,t6041-dcpext on DCP_FIRMWARE_V_27_0 so Wayland compositors select ARGB8888/ARGB2101010. Signed-off-by: Artyom Astafurov <artyom.astafurov@gmail.com>
gate_t6041_internal() already refuses an unapproved firmware-27 internal DCP, so the guard in gate_t6041_max_run() does not leave an internal display enabled; update the log message and KUnit case name to match. Signed-off-by: Artyom Astafurov <artyom.astafurov@gmail.com>
ane_h16_map() ran ane_h16_dart_protection(b, true) across all H16 profiles, including the 26.x profiles on apple,t6041-ane (T6040/T6041) and apple,t8132-ane. Add require_dart_unlocked to struct ane_h16_profile and enable it on the H16 27.2 (26B123) profile so all H16 boards still log the three DART protection words at map time while 26.x profiles keep their prior MAP admission. Signed-off-by: Artyom Astafurov <artyom.astafurov@gmail.com>
check_fw_regions() accepted a second translated memory-region on any apple,t6041-aop or apple,t8132-aop board before probe checked whether the firmware's bootarg table declared ED0p. Inspect the bootarg table upfront with bootargs_has_ed0p() and pass allow_ed0p into check_fw_regions() so a translated region outside EC0p is refused before AopData::new() unless a single 8-byte ED0p entry is present. Signed-off-by: Artyom Astafurov <artyom.astafurov@gmail.com>
|
Review of b224fde against integration/aurora e0ee46a. It merges cleanly, and CI is green on this head. The three follow-up PRs are also being built together on today's base in #2532 (CI only), because integration has moved under Nothing here reaches the J700 (T8140) or the M5 Pro (T6050). The AOP change applies only to the Two notes. Neither blocks the merge:
The M4 mini (T8132 AOP/ANE) gets a no-regression row after the merge. |
f5931f9
into
aurora-silicon:integration/aurora
|
Merged as f5931f9 (head b224fde onto integration/aurora e0ee46a). Checks before the merge:
This code does not run on the J700 or the M5. The no-regression checks that follow are:
A revert is ready if either check fails. The two notes in the review comment above still stand as follow-ups. |
Follow-ups to #1954 for J616c (T6041) on macOS 27.2 firmware:
drm/apple(apple_drv.c): Extendxrgb_is_alphaonDCP_FIRMWARE_V_27_0toapple,t6041-dcpandapple,t6041-dcpext. Like T8142 (43f89808a996), T6041 firmware 27 ignoresis_premultipliedand blends byte 3 ofDCP_FORMAT_BGRA(XRGB8888) as straight alpha; AGXPIPE_FORMAT_B8G8R8X8_UNORMleaves PBESwizzle Aat channel 0 (X = R), turningR = 0blues and cyans black on the panel while screenshots look normal. Offering only alpha formats (ARGB8888/ARGB2101010) fixes panel colors.soc: apple: display-gate: Clarify the unapproved firmware-27 log message and KUnit case name ingate_t6041_max_run(), sincegate_t6041_internal()already refuses an unapproved firmware-27 internal DCP.accel/ane: Scope H16ane_h16_dart_protection()refusal atMAPtime (require_dart_unlocked) to theH16 27.2 26B123profile while keeping DART protection logging on all H16 profiles.soc: apple: aop: Check that the firmware bootarg table declares a single 8-byteED0pentry (bootargs_has_ed0p()) beforecheck_fw_regions()accepts a translated external data segment outsideEC0p.Testing
J616c/ T6041, macOS 27.2.126B131DCP firmware): verifiedniriselectsAR24(ARGB8888) at3456x2160@120oneDP-1with normal panel colors and 0 faults.aop-bootargs-tests.py,dcpext26-crossbar-union-tests.py,t6040-calibration-tests.py,apple-dcp/run.py(89/89), andARCH=arm64 LLVM=1C/Rust/KUnit builds.