Repository navigation
soc: apple: display-gate, drm/apple: start the T8122 external DCP on its 27.2 image - #2584
Closed
RyanTheTide wants to merge 1 commit into
Closed
RyanTheTide wants to merge 1 commit into
RyanTheTide wants to merge 1 commit into
Conversation
…its 27.2 image
On the macOS 27.2 (26B123) system firmware the boot loader can reserve
the T8122 external display processor's firmware (chosen
asahi,t8122-dcpext): it marks dcp@31ac00000 firmware-ready and
publishes firmware version and compatibility 27.2.0, but no image
UUID. The gate then refuses it ("its firmware-compat is not 14.7.0"),
so neither USB-C port gets DisplayPort alt mode.
The processor runs the internal DCP's 27.2 image: the first region the
boot loader reserves for it is the internal DCP's text region. Its
DISPEXT power domains are off at handoff, so nothing is running there
to adopt; Linux starts it, as it does the 14.7 one.
Add apple_t8122_dcpext_v27_2(): a T8122 dcpext whose firmware version
and compatibility are 27.2.0, beside an internal DCP handed over on the
27.2 image. The gate admits it alongside 14.7.0, and the DCP driver
runs it on the firmware-27 backend with the 27.2 table, with the
firmware-27 endpoints, both DPTX port services, no live-session
adoption, and without a firmware clock table, as the T6041 dcpext (it
has no apple,clock-ids; counting them failed the bind with -EINVAL).
On that image the processor and its scanout also use the panel's DMA
window, the 1 TiB alias. The display subsystem takes the window all
its display DARTs share, and the device tree's 14.7 windows for the
external DARTs (from 0) share none with the panel's: once the external
processor joined, the internal DCP lost its scanout mappings (DART
translation faults, no modes). When it admits the 27.2 image, the gate
copies the internal DCP DART's apple,dma-range onto both external
DARTs, as the J613 native 26.x device tree does for that firmware; the
device tree keeps the 14.7 windows.
The 14.7 and native 26.x paths are unchanged.
Tested on the J615 (MacBook Air 15", M3), 27.2 stub, boot loader with
chosen.asahi,t8122-dcpext=1 and its unchanged device tree: before, the
gate refused the dcpext; with this change it starts (RTKit, IOMFB
endpoint, "DCP booted"), DRM gains DP-1 and DP-2 for the two USB-C
ports, the internal panel stays connected, no DART faults. No external
monitor was attached.
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Contributor
Author
|
Blockers: 2.
Nit: drivers/gpu/drm/apple/dcp.c:7303-7306: the comment says the DART window is "the one the device tree describes", but on this path the gate has just replaced it. HW row: J615 on the 27.2 stub, default command line: an external monitor on each USB-C port is modeset at its native mode with hotplug out/in, the internal panel stays up throughout, then one s2idle cycle with the external display lit, 0 DART faults, 0 new kernel errors. The body notes that the per-port DPTX service is not announced at boot, so this is the row that shows DP-1/DP-2 actually train. Assisted-by: LLM (Claude:Opus 5.5) |
Contributor
Author
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.
Stacked on #2580 (the M3 Air internal display on macOS 27.2); base is that branch, so this diff is one commit.
Problem
On the macOS 27.2 stub the boot loader can hand over the M3 (T8122) external display processor (
chosen.asahi,t8122-dcpext=1), but the display gate refuses it ("its firmware-compat is not 14.7.0"), so neither USB-C port gets DisplayPort alt mode. Admitting it naively also breaks the internal panel: the external display DARTs are described with 14.7 windows from 0, the panel's DARTs use the 1 TiB alias, and the display subsystem ends up with no common window (DART translation faults, panel loses its modes).Change
apple_t8122_dcpext_v27_2(): a T8122 dcpext with firmware version/compat 27.2.0 beside an internal DCP on the 27.2 image (the boot loader publishes no image UUID for the dcpext; it runs the internal processor's image).apple,dma-range(the panel's window) on that path only. The device tree keeps the 14.7 windows.num_dptx_ports = 2), no firmware clock table (as the T6041 dcpext).Testing
J615 (MacBook Air 15", M3), 27.2 stub, boot loader with
chosen.asahi,t8122-dcpext=1, one-shot lab boots:Still to run
Boot-by-boot evidence (lab steps on the J615)
display-subsystem: non-overlapping DMA windows 0x0..0xffffeffff, 0x100_0000_0000..; disp0 DART translation faultsLab kernels were built from the J615 bring-up tree, where the refmac firmware-27 path already admits a t8122-dcpext at 27.2.0, so they carry this change minus the
dcp_check_firmware_version()hunk; on this branch that hunk is what selects the firmware-27 table.Assisted-by: LLM (Claude:Opus 5.5)