Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
1ccee5b
dt-bindings: display: apple: describe a common scanout aperture
DjDeveloperr Oct 31, 2026
130cd47
iommu/apple-dart: honor consumer apertures before intersecting streams
DjDeveloperr Oct 31, 2026
4e33348
arm64: dts: apple: t8122: retain the common scanout DMA alias
DjDeveloperr Oct 31, 2026
e57886c
drm/asahi: g15: pin J514S cd05 firmware TEXT
javanoo6 Nov 5, 2026
bcd44e5
tools/asahi: refresh T6030 golden pins for the J514S cd05 row
scottjones Nov 8, 2026
cbfc6b0
drm/asahi: g15: pin the cd05 firmware TEXT on the J516S
joelvj Nov 6, 2026
03fce6f
drm/asahi: g15: pin the 4118 firmware TEXT on the J514S and J516S
scottjones Nov 8, 2026
d46d1f1
drm/asahi: g15: decline probes before activation with -ENODEV
scottjones Nov 13, 2026
580bd66
pmdomain: apple: pmp-report: keep the T8122 14.x GPU readiness for th…
scottjones Oct 23, 2026
9a2a398
tools/asahi: test the T8122 14.x PMP wait in the supplier suite
scottjones Oct 23, 2026
5c2bc76
drm/apple: add the J504 internal panel record
scottjones Nov 5, 2026
96634b0
drm/asahi: start the T8122 GPU runtime on the J504
scottjones Nov 5, 2026
36d06f6
arm64: dts: apple: t8122-j504: describe the internal panel
scottjones Nov 5, 2026
004f77c
drm/apple: open the J504 panel brightness path
scottjones Nov 5, 2026
5518d44
drm/asahi: m3: map the adopted handoff regions as the 7.2 runtime did
scottjones Nov 11, 2026
48b5fd6
drm/asahi: build the T8122 runtime without the G15 backend
scottjones Oct 24, 2026
00b36b5
drm/apple: give the J516C panel an EDID
malik-na Oct 22, 2026
7dc22ca
drm/asahi: add explicit J514C bring-up admission
chriskearney Nov 5, 2026
e6076b6
drm/asahi: pin the J514C bring-up firmware candidate exactly
chriskearney Nov 5, 2026
11db9ef
drm/asahi: refine the J514C bring-up diagnostics and pin tests
chriskearney Nov 5, 2026
9b81cd9
drm/asahi: start J514C graphics on normal boots
chriskearney Nov 5, 2026
08a72f3
drm/asahi: describe normal J514C profile admission
chriskearney Nov 5, 2026
2a0e626
soc: apple: default J514C native display on normal boots
chriskearney Nov 5, 2026
ebb4e3a
drm/asahi: require a board binding on every J516C pin
chriskearney Nov 5, 2026
17b41da
ci: register normal J514C native-display admission checks
chriskearney Nov 5, 2026
9b9a2b5
dt-bindings: display: describe the T6034 internal display path
chriskearney Nov 5, 2026
50e0f06
drm/apple: admit J514M native display on normal boots
chriskearney Nov 5, 2026
b5079e4
drm/asahi: add a measured J514M T6034 GPU profile
chriskearney Nov 5, 2026
28ad1ab
arm64: dts: apple: describe the J514M internal display
chriskearney Nov 5, 2026
79db8d1
drm/asahi: record the measured J514M enabled-core masks
chriskearney Nov 5, 2026
2a6b5f6
drm/asahi: pin the measured J514M GPU firmware identity
chriskearney Nov 5, 2026
26e640c
drm/apple: add opt-in J516M native panel admission
DanielLemky Nov 7, 2026
4c863f2
drm/asahi: admit the measured J516M T6034 GPU profile
DanielLemky Nov 7, 2026
001c46e
drm/apple: enable bounded J516M built-in panel brightness
DanielLemky Nov 7, 2026
74b32be
drm/asahi: g15: admit any 30-core J516M bin, not one Mac's core mask
scottjones Nov 8, 2026
c144d50
soc: apple: t6030-display-gate: default the J516M native display on n…
scottjones Nov 8, 2026
efc2c8b
tools/asahi: g15: follow the J516M profile in two host fixtures
scottjones Nov 8, 2026
4fd4c05
drm/apple: v14-board-test: J516M is admitted on its own record
scottjones Nov 8, 2026
9ae1f54
tools/asahi: register the J514C and T6034 host tests and follow the d…
scottjones Nov 14, 2026
06fdb94
drm/asahi: g15: admit a third J516C GPU firmware TEXT (125f0497)
malik-na Oct 31, 2026
b1a3a18
drm/asahi: g15: also admit TEXT 125f0497 on J514C
malik-na Nov 13, 2026
3f8f861
dt-bindings: power: apple,t8140-pmp-report: accept the T6034 report
scottjones Nov 17, 2026
5a2b02a
drm/asahi: g15: drop the unused params import from boot.rs
scottjones Nov 17, 2026
111f732
media: apple: isp: correct the T8122 PMU base address
garymeyerca Oct 16, 2026
5550993
media: apple: isp: use temporal filter zero on J613 firmware 14.7
garymeyerca Oct 16, 2026
bcb99bf
media: apple: isp: use temporal filter zero on J615 firmware 14.7 too
scottjones Oct 24, 2026
ae6c455
drm/apple: enable the J615 panel brightness path
ericjuta Nov 13, 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
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/display/apple,dcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ description:
properties:
compatible:
oneOf:
- const: apple,t6034-dcp
- items:
- enum:
- apple,t8103-dcp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ properties:
- enum:
- apple,display-subsystem
- apple,t6031-display-subsystem
- apple,t6034-display-subsystem
- apple,t8122-display-subsystem
- apple,t8132-display-subsystem
- const: apple,t8132-display-diagnostics
deprecated: true
Expand Down Expand Up @@ -50,6 +52,15 @@ properties:
type: boolean
description: The loader validated the inherited J713 SID0 scanout mapping.

apple,dma-range:
$ref: /schemas/types.yaml#/definitions/uint64-array
minItems: 2
maxItems: 2
description:
Common scanout DMA aperture, encoded as a base and nonzero size. This
overrides the default aperture of each referenced DART stream. Other
consumers of the same DART retain their own apertures.

required:
- compatible
- iommus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ properties:
- apple,t8122-pmp-v2-report
- apple,t8140-pmp-v2-report
- items:
- const: apple,t6031-pmp-v2-report
- enum:
- apple,t6031-pmp-v2-report
- apple,t6034-pmp-v2-report
- const: apple,t6020-pmp-v2-report

reg:
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/soc/apple/apple,pmp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ properties:
- enum:
- apple,t6030-pmp-v2
- apple,t6031-pmp-v2
- apple,t6034-pmp-v2
- apple,t6041-pmp-v2
- apple,t6050-pmp-v2
- apple,t8122-pmp-v2
Expand Down
28 changes: 28 additions & 0 deletions arch/arm64/boot/dts/apple/t6034-dcp.dtsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// SPDX-License-Identifier: GPL-2.0+ OR MIT
/*
* J514M/T6034 internal display. Fresh ADT metadata identifies the same
* DCP/DART/PMP register layout and 14.7 firmware images as T6031, with a
* 400 MHz disp0 clock. Keep a separate handoff and component compatible;
* every consumer remains disabled until the T6034 gate validates it.
*/
#include "t6031-dcp.dtsi"

&clk_disp0 {
clock-frequency = <400000000>;
};

&display {
compatible = "apple,t6034-display-subsystem";
};

&dcp {
compatible = "apple,t6034-dcp";
};

&pmp {
compatible = "apple,t6034-pmp-v2", "apple,t6000-pmp-v2";
};

&pmp_report {
compatible = "apple,t6034-pmp-v2-report", "apple,t6020-pmp-v2-report";
};
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/apple/t6034-j514m.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/dts-v1/;

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

/ {
Expand Down
14 changes: 14 additions & 0 deletions arch/arm64/boot/dts/apple/t6034-j516m.dts
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,17 @@
status = "disabled";
};
};

/*
* J516M ADT confirms the J516C display register and interrupt layout.
* External displays (dcpext, HDMI) are not described here yet.
*/
&clk_disp0 {
/*
* Preserve the captured boot-clock metadata, as the J514M path does.
* Firmware warns that this is below its video clock;
* that warning is not proof of the programmed clock or a startup veto.
* The metadata does not qualify sustained power or thermal behavior.
*/
clock-frequency = <400000000>;
};
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/apple/t8122-dcp.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
display: display-subsystem {
compatible = "apple,t8122-display-subsystem";
iommus = <&disp0_dart 0>;
/* Keep the inherited scanout alias when adding external streams. */
apple,dma-range = /bits/ 64 <0x10000000000 0x1000000000>;
status = "disabled";
};
};
Expand Down
12 changes: 11 additions & 1 deletion arch/arm64/boot/dts/apple/t8122-j504.dts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,23 @@
&dcp {
panel: panel {
compatible = "apple,panel-j504", "apple,panel-mini-led", "apple,panel";
/*
* The J514S panel: 3024x1964 at 254 ppi; 189 mm high without the
* 74 notch rows. The J504 boot framebuffer is 3024x1890 below them.
*/
width-mm = <302>;
height-mm = <196>;
adj-height-mm = <189>;
apple,max-brightness = <600>;
apple,max-brightness = <500>;
};
};

/* The boot framebuffer is the same panel, as on the J613 (HiDPI scale for simpledrm). */
&framebuffer0 {
panel = <&panel>;
post-init-providers = <&panel>;
};

&wifi0 {
brcm,board-type = "apple,tresco";
};
Expand Down
3 changes: 2 additions & 1 deletion drivers/gpu/drm/apple/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ appledrm-y += afk.o dcp.o dcp-fabric.o dcp_backlight.o dptxep.o iomfb.o parser.o
appledrm-y += dcp-hdmi.o
appledrm-$(CONFIG_DRM_APPLE_AUDIO) += audio.o
appledrm-$(CONFIG_DRM_APPLE_AUDIO) += av.o
appledrm-y += connector.o dcp-panel-adt.o dcp-display-metadata.o dcp-180hz.o
appledrm-y += connector.o dcp-panel-adt.o dcp-display-metadata.o dcp-180hz.o dcp-panel-edid.o
appledrm-y += ibootep.o
appledrm-y += dcpext_scanout.o
appledrm-y += dcpext_drm.o
Expand All @@ -29,6 +29,7 @@ appledrm-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp_external_ready_test.o
appledrm-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp_external_announce_test.o
appledrm-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp_external_relink_test.o
appledrm-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp_dropped_swap_test.o
appledrm-$(CONFIG_DRM_APPLE_KUNIT_TEST) += dcp-panel-edid-test.o
appledrm-y += iomfb_v26_6.o iomfb_v26_6_link.o j613_dcp_activate.o
appledrm-y += iomfb_v27.o
appledrm-y += epic/dpavservep.o
Expand Down
17 changes: 17 additions & 0 deletions drivers/gpu/drm/apple/apple_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static DEFINE_MUTEX(apple_g15_display_lock);
static struct device *apple_t6030_display;
static struct device *apple_t6031_display;
static struct device *apple_t8132_display;
static struct device *apple_t6034_display;

/* The publication slot of a G15/G16 SoC's internal display subsystem, or NULL. */
static struct device **apple_g15_display_slot(struct device *dev)
Expand All @@ -92,6 +93,8 @@ static struct device **apple_g15_display_slot(struct device *dev)
return &apple_t6031_display;
if (of_device_is_compatible(dev->of_node, "apple,t8132-display-subsystem"))
return &apple_t8132_display;
if (of_device_is_compatible(dev->of_node, "apple,t6034-display-subsystem"))
return &apple_t6034_display;
return NULL;
}

Expand Down Expand Up @@ -165,6 +168,18 @@ int apple_drm_t8132_link_device(struct device *consumer)
}
EXPORT_SYMBOL_GPL(apple_drm_t8132_link_device);

int apple_drm_t6034_link_device(struct device *consumer)
{
if (of_machine_is_compatible("apple,j516m"))
return apple_g15_link_device(consumer, "apple,t6034", "apple,agx-t6034",
&apple_t6031_display);
if (!of_machine_is_compatible("apple,j514m"))
return -ENODEV;
return apple_g15_link_device(consumer, "apple,t6034", "apple,agx-t6034",
&apple_t6034_display);
}
EXPORT_SYMBOL_GPL(apple_drm_t6034_link_device);

DEFINE_DRM_GEM_DMA_FOPS(apple_fops);

#define DART_PAGE_SIZE 16384
Expand Down Expand Up @@ -1429,6 +1444,7 @@ static const struct of_device_id apple_dcp_id_tbl[] = {
{ .compatible = "apple,t6030-dcp" },
{ .compatible = "apple,t8122-dcp" },
{ .compatible = "apple,t6031-dcp" },
{ .compatible = "apple,t6034-dcp" },
#if IS_ENABLED(CONFIG_DRM_APPLE_DCP_T8132)
{ .compatible = "apple,t8132-dcp" },
#endif
Expand Down Expand Up @@ -1937,6 +1953,7 @@ static const struct of_device_id of_match[] = {
{ .compatible = "apple,t6030-display-subsystem" },
{ .compatible = "apple,t8122-display-subsystem" },
{ .compatible = "apple,t6031-display-subsystem" },
{ .compatible = "apple,t6034-display-subsystem" },
#if IS_ENABLED(CONFIG_DRM_APPLE_DCP_T8132)
{ .compatible = "apple,t8132-display-subsystem" },
/* Accept the qualified handoff emitted by the existing boot loader. */
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/apple/dcp-internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "dcp-announce.h"
#include "dcp-display-metadata.h"
#include "dcp-metadata-epoch.h"
#include "dcp-panel-edid.h"
#include "dcp-180hz.h"
#include "iomfb.h"
#include "iomfb_h17p.h"
Expand Down Expand Up @@ -224,6 +225,8 @@ struct dcp_panel {
u32 edr_ceiling;
/// calibrated colour target from the raw ADT; NULL if not given
const struct dcp_color_space *color_target;
/// make and product for the base EDID, from the panel's compatible
struct dcp_panel_id id;
};

/*
Expand Down
Loading
Loading