Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0245090
arm64: dts: apple: t6031: describe the GPU, disabled
chriskearney Oct 11, 2026
cabd4b6
soc: apple: mailbox: match the T6031 GPU mailbox without the v4 fallback
malik-na Oct 12, 2026
7dfc3c2
drm/asahi: g15: Add the T6031 (M3 Max, G15C) configuration row
malik-na Oct 18, 2026
9609d14
drm/asahi: g15: Pin the J516C GPU firmware build
malik-na Oct 18, 2026
04e10f0
drm/asahi: g15: Build the J516C initdata from its board images
malik-na Oct 18, 2026
9174c1e
drm/asahi: g15: Encode compute commands with the G15C register values
malik-na Oct 18, 2026
bfcfee0
drm/asahi: g15: Admit and map UAT regions that are reserved System RAM
malik-na Oct 18, 2026
ee31c61
arm64: dts: apple: t6031: describe the internal display, disabled
chriskearney Oct 11, 2026
a6f2c6e
soc: apple: pmp: hold the T6031 display through its own PMP table
malik-na Oct 18, 2026
f0867fd
soc: apple: t6031: take the internal display handoff and add the PMP
malik-na Oct 18, 2026
a3bb02d
drm/apple: adopt the T6031 (J516C) panel session
malik-na Oct 18, 2026
e30d702
drm/asahi: g15: Accept the J516C 14.8 GPU firmware build
malik-na Oct 18, 2026
65cd19c
drm/asahi: g15: Say what to report when the GPU firmware build is unk…
malik-na Oct 19, 2026
fd3c8ad
drm/apple: build a base EDID block for a built-in panel
malik-na Oct 19, 2026
87ab56d
drm/apple: give the T6031 panel its base EDID
malik-na Oct 19, 2026
e3dad1b
drm/apple: give the built-in panel's 14.7 swaps timestamps
malik-na Oct 19, 2026
46588ef
drm/asahi: g15: Move the board template fill into a core-only submodule
malik-na Oct 19, 2026
b78b758
drm/asahi: g15: t6031: Build Globals and Power from the device tree
malik-na Oct 19, 2026
7c26fe1
drm/asahi: g15: Read back the GPU's performance state in debugfs
malik-na Oct 19, 2026
b3fb1bb
drm/asahi: g15: board: Review fixes for the device-tree Globals and P…
malik-na Oct 19, 2026
6c6a270
drm/asahi: g15: t6031: Build the hardware record from the device tree
malik-na Oct 19, 2026
5131caf
drm/asahi: g15: t6031: Leave the 42 record words the firmware does no…
malik-na Oct 19, 2026
2e21853
drm/asahi: t6031: take the idle standby time from the GPU node
malik-na Oct 19, 2026
a08331e
drm/apple: stamp 14.7 swaps only for the T6031 panel profile
malik-na Oct 19, 2026
4533852
drm/apple: adopt only the J516C panel with the T6031 profile
malik-na Oct 19, 2026
97f81d5
drm/asahi: g15: Seed the compute UMA freelist with every pool
malik-na Oct 19, 2026
a7aa691
drm/asahi: g15: Leave PB growth requests unanswered after two refusal…
malik-na Oct 19, 2026
b4a6b32
drm/asahi: g15: Keep PB blocks above the firmware's growth maximum fo…
malik-na Oct 19, 2026
027bd76
drm/asahi: g15: Map a 512 MiB parameter buffer heap
malik-na Oct 19, 2026
bc9bfea
drm/asahi: g15: Account PB backing and re-initialization in the growt…
malik-na Oct 20, 2026
1f15a0f
drm/asahi: g15: Back the parameter-buffer heap in 16 MiB chunks on de…
malik-na Oct 20, 2026
c4d0c0a
drm/asahi: g15: Start the parameter buffer at 64 blocks
malik-na Oct 20, 2026
4e13611
drm/asahi: g15: Reclaim the parameter buffer when the engine is idle
malik-na Oct 20, 2026
661b7c1
drm/asahi: g15: Re-initialize the parameter buffer at a client boundary
malik-na Oct 20, 2026
e272b67
drm/asahi: g15: Never post a whole parameter-buffer block list
malik-na Oct 21, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 131 additions & 0 deletions arch/arm64/boot/dts/apple/t6031-dcp.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* T6031 internal display.
*
* The same description as t6030-dcp.dtsi: the DCP, its mailbox, the two
* display DARTs, the display subsystem and its PIODMA stream. The T6031
* display block is the T6030 block at 0x3_8400_0000 instead of
* 0x2_8c00_0000, with every offset inside it unchanged. Addresses,
* interrupts and DART windows are those of the J516C ADT.
*
* Every node stays status = "disabled". The display gate enables the DCP,
* its mailbox, the two DARTs and the display subsystem only when
* apple_t6031_display.enable=1 is on the kernel command line and the boot
* loader has set apple,t6031-handoff = <1>. Compatibles are t6031-specific,
* so a kernel that does not know them leaves the nodes unbound.
*
* Only the T6031 board files include this file: t6034.dtsi includes
* t6031.dtsi, and none of this is known to hold on T6034.
* The panel child is board-specific and is added by the board file.
*/

/ {
aliases {
/* The boot loader finds the display nodes through these. */
dcp = &dcp;
disp0 = &display;
disp0-piodma = &disp0_piodma;
disp0_piodma = &disp0_piodma;
};

/* The ADT gives no rate for it: this is the T6030 rate, unconfirmed here. */
clk_disp0: clock-disp0 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <712000000>;
clock-output-names = "clk_disp0";
};
};

&soc {
dcp_mbox: mailbox@386c08000 {
compatible = "apple,t6031-asc-mailbox", "apple,asc-mailbox-v4";
reg = <0x3 0x86c08000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1029 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1030 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1031 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1032 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "send-empty", "send-not-empty",
"recv-empty", "recv-not-empty";
power-domains = <&ps_disp_fe>;
#mbox-cells = <0>;
status = "disabled";
};

dcp_dart: iommu@38530c000 {
compatible = "apple,t6031-dart", "apple,t8110-dart";
reg = <0x3 0x8530c000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1008 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
apple,dma-range = <0x100 0x0 0x10 0x0>;
status = "disabled";
};

disp0_dart: iommu@385304000 {
compatible = "apple,t6031-dart", "apple,t8110-dart";
reg = <0x3 0x85304000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1008 IRQ_TYPE_LEVEL_HIGH>;
#iommu-cells = <1>;
apple,dma-range = <0x100 0x0 0x10 0x0>;
status = "disabled";
};

/*
* The DCP's ADT clock gate depends on both DISP_CPU and DISP_FE, and
* on T6031 DISP_FE is the child of DISP_CPU: DISP_FE keeps all three
* display power states on.
*/
dcp: dcp@386c00000 {
compatible = "apple,t6031-dcp";
mboxes = <&dcp_mbox>;
mbox-names = "mbox";
iommus = <&dcp_dart 5>;
reg-names = "coproc", "disp-0", "disp-1", "disp-2", "disp-3",
"disp-4", "disp-5", "iop-vbar";
reg = <0x3 0x86c00000 0x0 0x4000>,
<0x3 0x84000000 0x0 0x690000>,
<0x3 0x84800000 0x0 0x690000>,
<0x3 0x85320000 0x0 0x4000>,
<0x3 0x85344000 0x0 0x4000>,
<0x3 0x86800000 0x0 0x800000>,
<0x2 0x903d0000 0x0 0x4000>,
<0x3 0x86850000 0x0 0x4000>;
power-domains = <&ps_disp_fe>;
clocks = <&clk_disp0>;
#address-cells = <2>;
#size-cells = <2>;
status = "disabled";

disp0_piodma: piodma {
iommus = <&disp0_dart 4>;
};
};

display: display-subsystem {
compatible = "apple,t6031-display-subsystem";
iommus = <&disp0_dart 0>;
status = "disabled";
};
};

/*
* The display gate adds the PMP only on display power states the boot
* loader leaves on; the power state driver does not read this.
*/
&ps_disp_sys {
/* The bootloader leaves the internal display powered. */
apple,inherited-on;
};

&ps_disp_fe {
/* The bootloader leaves the internal display powered. */
apple,inherited-on;
};

&ps_disp_cpu {
/* The bootloader leaves the internal display powered. */
apple,inherited-on;
};
153 changes: 153 additions & 0 deletions arch/arm64/boot/dts/apple/t6031-gpu.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* Apple T6031 (M3 Max / G15C) GPU description.
*
* The register ranges and interrupts come from the J516C iBoot ADT: /arm-io
* maps child 0 to 0x2_0000_0000 here, so sgx is at 0x4_0800_0000 and gfx-asc
* at sgx + 0x240_0000, the T6030 offset. The GPU and its mailbox stay
* disabled.
*
* The rest of the description is each machine's, and the boot loader fills it
* from its ADT when it hands the GPU over, as on T8122: the operating points
* (one opp-microvolt cell per cluster, four clusters, and a power each), the
* CS and AFR operating points, the leakage and power-management coefficients,
* the firmware version, the UAT regions below, and the firmware segments,
* which it adds itself as the "fw-text" and "fw-data" memory regions. It
* enables the mailbox and then the GPU node last. Nothing here has a T6030
* value copied into it.
*/

/ {
aliases {
gpu = &gpu; /* the boot loader finds the GPU node through this alias */
};

gpu_opp: opp-table-gpu {
compatible = "operating-points-v2";

/*
* Placeholder only. The boot loader deletes these children and
* creates one OPP per performance state, with one opp-microvolt
* cell per cluster (the four per-cluster voltage tables of the
* ADT) and opp-microwatt. Until then every value is zero.
*/
opp00 {
opp-hz = /bits/ 64 <0>;
opp-microvolt = <0 0 0 0>;
opp-microwatt = <0>;
};
};

/*
* CS and AFR clock domains (ADT cs-perf-states, afr-perf-states).
* Placeholders with one opp-microvolt cell (one die); the boot loader
* replaces the children.
*/
gpu_cs_opp: opp-table-gpu-cs {
compatible = "operating-points-v2";

opp00 {
opp-hz = /bits/ 64 <0>;
opp-microvolt = <0>;
};
};

gpu_afr_opp: opp-table-gpu-afr {
compatible = "operating-points-v2";

opp00 {
opp-hz = /bits/ 64 <0>;
opp-microvolt = <0>;
};
};

reserved-memory {
/*
* Filled and enabled by the boot loader from the ADT sgx
* gpu-region-*, gfx-shared-region-*, gfx-handoff-* and
* gfx-shared-l2-region-* properties. Disabled until then.
*/
uat_ttbs: uat-ttbs {
reg = <0 0 0 0>;
status = "disabled";
};

uat_pagetables: uat-pagetables {
reg = <0 0 0 0>;
status = "disabled";
};

uat_handoff: uat-handoff {
reg = <0 0 0 0>;
status = "disabled";
};

uat_pagetables_l2: uat-pagetables-l2 {
reg = <0 0 0 0>;
status = "disabled";
};
};
};

&soc {
gpu: gpu@40a400000 {
compatible = "apple,agx-t6031";
reg = <0x4 0x0a400000 0x0 0x6c000>,
<0x4 0x08000000 0x0 0x3fdc000>;
reg-names = "asc", "sgx";
interrupt-parent = <&aic>;
/* Preserve the ADT order; entry 5 (IRQ 1249) is marked invalid there. */
interrupts = <AIC_IRQ 0 1224 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1225 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1226 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1227 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1247 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1249 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1239 IRQ_TYPE_LEVEL_HIGH>;
/* "gfx" (pmgr_gfx + 0x110), whose parent is afr. */
power-domains = <&ps_gfx>;
/*
* Do not hold back the ps_gfx sync_state() on this device when it
* never probes, as on the T6030 and T8122.
*/
post-init-providers = <&ps_gfx>;
mboxes = <&agx_mbox>;
memory-region = <&uat_ttbs>, <&uat_pagetables>,
<&uat_handoff>, <&uat_pagetables_l2>;
memory-region-names = "ttbs", "pagetables", "handoff",
"pagetables-l2";

/* Zero until the boot loader identifies the loaded GPU firmware. */
apple,firmware-abi = <0 0 0>;
apple,firmware-version = <0 0 0>;
apple,firmware-compat = <0 0 0>;

operating-points-v2 = <&gpu_opp>;
apple,cs-opp = <&gpu_cs_opp>;
apple,afr-opp = <&gpu_afr_opp>;

/* The boot loader sets "okay" as its last step. */
status = "disabled";
};

/*
* The ASC mailbox at asc + 0x8000. The ADT lists the gfx-asc interrupts
* as 1244, 1243, 1246, 1245; in mailbox order they are 1243..1246, the
* same swap as on T8122. Like the T6030 and T8122 ones it carries no
* asc-mailbox-v4 fallback, so a kernel without M3 Max GPU support
* leaves it unbound even after the boot loader has enabled it.
*/
agx_mbox: mbox@40a408000 {
compatible = "apple,t6031-agx-asc-mailbox";
reg = <0x4 0x0a408000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1243 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1244 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1245 IRQ_TYPE_LEVEL_HIGH>,
<AIC_IRQ 0 1246 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "send-empty", "send-not-empty",
"recv-empty", "recv-not-empty";
#mbox-cells = <0>;
status = "disabled";
};
};
15 changes: 15 additions & 0 deletions arch/arm64/boot/dts/apple/t6031-j514c.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/dts-v1/;

#include "t6031.dtsi"
#include "t6031-dcp.dtsi"
#include "t603x-j514-j516.dtsi"

/ {
Expand All @@ -29,6 +30,20 @@
brcm,board-type = "apple,texa";
};

/*
* The J514S values (t6030-j514s.dts): the same chassis and panel.
* Not yet read from a J514C.
*/
&dcp {
panel {
compatible = "apple,panel-j514", "apple,panel-mini-led", "apple,panel";
width-mm = <302>;
height-mm = <196>;
adj-height-mm = <189>;
apple,max-brightness = <500>;
};
};

&aop_audio {
apple,chassis-name = "J514";
apple,machine-kind = "MacBook Pro";
Expand Down
15 changes: 15 additions & 0 deletions arch/arm64/boot/dts/apple/t6031-j516c.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/dts-v1/;

#include "t6031.dtsi"
#include "t6031-dcp.dtsi"
#include "t603x-j514-j516.dtsi"

/ {
Expand All @@ -29,6 +30,20 @@
brcm,board-type = "apple,jura";
};

/*
* The J516S values (t6030-j516s.dts): the same chassis and panel.
* Not yet read from a J516C.
*/
&dcp {
panel {
compatible = "apple,panel-j516", "apple,panel-mini-led", "apple,panel";
width-mm = <346>;
height-mm = <223>;
adj-height-mm = <216>;
apple,max-brightness = <500>;
};
};

&aop_audio {
apple,chassis-name = "J516";
apple,machine-kind = "MacBook Pro";
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/apple/t6031.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

#include "t6031-gpio-pins.dtsi"
#include "t6031-pmgr.dtsi"
#include "t6031-gpu.dtsi"

#undef DIE
#undef DIE_NO
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/apple/t6034.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
compatible = "apple,t6034", "apple,arm-platform";
};

/*
* The 14-core M3 Max has its own GPU (30 cores), whose clusters and core masks
* the T6031 description does not give. Its own compatible keeps the T6031 GPU
* support from binding to it even if a boot loader enabled the node.
*/
&gpu {
compatible = "apple,agx-t6034";
};

// Memory channels not present on the 14-core variant
&ps_amcc6 {
status = "disabled";
Expand Down
16 changes: 16 additions & 0 deletions drivers/gpu/drm/apple/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,22 @@ config DRM_APPLE_DCP_T6030
after the display, so userspace should load appledrm explicitly
and blacklist its alias autoload.

config DRM_APPLE_DCP_T6031
bool "MacBook Pro M3 Max (J516C) internal panel"
depends on DRM_APPLE_DCP_T6030
depends on OF_DYNAMIC
help
Lets the common Apple display driver adopt the J516C (T6031)
internal display coprocessor, which the boot loader hands
over running DCP firmware 14.7.0, with the J514S session and
presentation paths at the T6031 addresses.

The boot loader describes the display with every node disabled.
The T6031 display handoff enables them, and adds this Mac's PMP
from the values the boot loader passes, only when
apple_t6031_display.enable=1 is on the kernel command line; the
boot framebuffer stays otherwise.

config DRM_APPLE_DCP_T6030_EXT
bool "MacBook Pro M3 Pro (J514S) external displays"
depends on DRM_APPLE_DCP_T6030
Expand Down
Loading