From 259813954ed423c34061eca6114828bd80c62e2c Mon Sep 17 00:00:00 2001 From: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> Date: Sun, 15 Nov 2026 08:47:53 -0700 Subject: [PATCH 1/2] arm64: dts: apple: t6050-j714s: route dcpext1 to the left-front port's DP tunnels A Thunderbolt dock on the left-front port lights two displays: DP IN 0 and 1 take dcpext0 and dcpext2, the only pipelines with a route to that port, and DP IN 2 waits: thunderbolt-apple-acio 2a9ac0000.acio: dpin2: no display pipeline free; waiting for one On the right port, dcpext1's tunnel-only route takes the third tunnel. Give dcpext1 the same route to the left-front port, as route@1 beside the right port's route@0, like dcpext0 and dcpext2: - PHY index 1 (atc1_phy) and the left-front crossbar's controls (atc1_dpxbar 0-4, "typec1" and "typec1-dpin0".."typec1-dpin3"), as dcpext0 and dcpext2 have them. - Crossbar source 2 (dispext1 port 0), as on the right port: both crossbars are "apple,t6050-display-crossbar", whose state is 2 * dispext + port; dcpext0 and dcpext2 use 0 and 4 on both. - apple,tunnel-only and no mode-switch: hpm1, like hpm2, already has TYPEC_MUX_MAX_DEVS (3) mode-switch providers (atc1_phy, dcpext0 and dcpext2). Tunnels find their port through the endpoint, typec1's new endpoint@2. The DRM connectors keep their names: tunnel-only port/pipeline pairs are created after the others, so dcpext1 x left-front is DP-6 after DP-5 (dcpext1 x right). Signed-off-by: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> --- .../boot/dts/apple/t6050-j714s-display.dtsi | 57 +++++++++++++------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi b/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi index 003b229e26409..67ebb8b3f6617 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi +++ b/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* - * J714s external displays: DisplayPort alt mode on the left-front and right ports and USB4 - * DisplayPort tunnels on the right port. dcpext0 and dcpext2 drive the DP alt mode and tunnel - * routes, dcpext1 a third tunnel on the right port only; dcpext3 is the pair for modes that - * need two pipelines. The left-back port (ATC0) is the debug port and is not described. + * J714s external displays: DisplayPort alt mode and USB4 DisplayPort tunnels on the left-front + * and right ports. dcpext0 and dcpext2 drive the DP alt mode and tunnel routes, dcpext1 a third + * tunnel on either port; dcpext3 is the pair for modes that need two pipelines. The left-back + * port (ATC0) is the debug port and is not described. * Addresses and interrupts are from the J714sAP ADT. The boot loader hands each engine over: it * enables the engine, its mailbox and DARTs, publishes its bandwidth scratch and adds its * display DART to the display subsystem. @@ -14,25 +14,30 @@ apple,connector-type = "USB-C"; apple,dptx-die = <0>; /* - * A third pipeline for USB4 DP tunnels on the right port, so a dock can - * drive three displays as on macOS. Routing dcpext1 stops it being a - * merged-mode peer; dcpext0, dcpext1 and dcpext2 then pair with dcpext3, - * so only one display wider than one pipeline runs at a time. - * Crossbar source 2 (dispext1 port 0) follows the 2 * dispext pattern of - * dcpext0 (0) and dcpext2 (4), and the T6040 dcpext1 (2). - * No mode-switch: hpm2 already has TYPEC_MUX_MAX_DEVS (3) mode-switch - * providers; tunnels find the port through the endpoint, not the mux. + * A third pipeline for USB4 DP tunnels on the right and left-front + * ports, so a dock on either can drive three displays as on macOS. + * Routing dcpext1 stops it being a merged-mode peer; dcpext0, dcpext1 + * and dcpext2 then pair with dcpext3, so only one display wider than + * one pipeline runs at a time. + * Crossbar source 2 (dispext1 port 0) on both crossbars follows the + * 2 * dispext pattern of dcpext0 (0) and dcpext2 (4), and the T6040 + * dcpext1 (2). + * No mode-switch: hpm1 and hpm2 already have TYPEC_MUX_MAX_DEVS (3) + * mode-switch providers each (the ATC PHY, dcpext0 and dcpext2); + * tunnels find the port through the endpoint, not the mux. * apple,tunnel-only keeps DP alt mode displays off it: only tunnels * have been driven through it. */ - apple,typec-dptx-phys = <2>; - apple,typec-mux-indices = <2>; - phys = <&atc2_phy 6>; - phy-names = "typec0"; + apple,typec-dptx-phys = <2 1>; + apple,typec-mux-indices = <2 2>; + phys = <&atc2_phy 6>, <&atc1_phy 6>; + phy-names = "typec0", "typec1"; mux-controls = <&atc2_xbar 0>, <&atc2_xbar 1>, <&atc2_xbar 2>, <&atc2_xbar 3>, - <&atc2_xbar 4>; + <&atc2_xbar 4>, <&atc1_dpxbar 0>, <&atc1_dpxbar 1>, <&atc1_dpxbar 2>, + <&atc1_dpxbar 3>, <&atc1_dpxbar 4>; mux-control-names = "typec0", "typec0-dpin0", "typec0-dpin1", "typec0-dpin2", - "typec0-dpin3"; + "typec0-dpin3", "typec1", "typec1-dpin0", "typec1-dpin1", + "typec1-dpin2", "typec1-dpin3"; typec-routes { #address-cells = <1>; @@ -48,6 +53,17 @@ }; }; }; + + route@1 { + reg = <1>; + apple,tunnel-only; + + port { + dcpext1_left: endpoint { + remote-endpoint = <&typec1_dp2>; + }; + }; + }; }; }; @@ -174,6 +190,11 @@ reg = <1>; remote-endpoint = <&dcpext2_left>; }; + + typec1_dp2: endpoint@2 { + reg = <2>; + remote-endpoint = <&dcpext1_left>; + }; }; }; }; From 6997339bb2b4b2892d099eb1098dfbbc6ebfa7bf Mon Sep 17 00:00:00 2001 From: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> Date: Sun, 15 Nov 2026 10:05:43 -0700 Subject: [PATCH 2/2] arm64: dts: apple: t6050-j714s: Add the left-front router's DP IN interrupts The left-front port's USB4 router (acio1) came with the port's USB4 support, but without the DP IN interrupts that the right port's router (acio2) has. With no "dpinN" interrupt, the router driver polls a mapped DP IN's status every 20 ms instead; the interrupt and the poll run the same handler. This is not a functional fix: with the interrupts, hot plug and IRQ_HPD events arrive without the up to 20 ms poll delay, and there is no idle poll per mapped DP IN. Give acio1 the four DP IN interrupts, as acio2 has. The numbers are those of atc1-dpin0..3 in the T6050 inventory and of J716c's acio1, and follow acio2's, 32 lower like the rest of the router's interrupts. The DP IN blocks there sit at the offsets the driver maps from the router's "rc" region. The display side is already in place: dcpext0, dcpext1 and dcpext2 have routes to this port with its DP IN crossbar controls (typec1-dpin0..3 on atc1_dpxbar). Signed-off-by: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> --- arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi b/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi index 67ebb8b3f6617..f4bd8b98ea502 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi +++ b/arch/arm64/boot/dts/apple/t6050-j714s-display.dtsi @@ -305,6 +305,13 @@ interrupt-names = "dpin0", "dpin1", "dpin2", "dpin3"; }; +/* The left-front router's DP IN interrupts (atc1-dpin0..3, as in the T6050 inventory and J716c) */ +&acio1 { + interrupts = , , + , ; + interrupt-names = "dpin0", "dpin1", "dpin2", "dpin3"; +}; + /* The right router's suppliers, disabled in the inventory */ &ps_atc2_cio { status = "okay";