Skip to content

drm/apple: dptxep: name a T6050 tunnel's DP IN in the DPTX connection - #2037

Merged
DjDeveloperr merged 1 commit into
integration/aurorafrom
djdev/t6050-dptx-tunnel-dpin
Nov 16, 2026
Merged

DjDeveloperr merged 1 commit into
integration/aurorafrom
djdev/t6050-dptx-tunnel-dpin

Conversation

@DjDeveloperr

@DjDeveloperr DjDeveloperr commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Part of a set of seven J714s external-display PRs, measured together (table below): #2032 EDID defaults, #2033 atc tunnel open, #2034 tunnel-only first (stacks on #1921), #2035 merged-mode limit, #2036 tunnel clock, #2037 DPTX connection DP IN and #2038 DP IN bandwidth allocation (merge those two together). Suggested order: #1921, #2006, then the set in any order.

What

One commit, drm/apple: dptxep: name a T6050 tunnel's DP IN in the DPTX connection.

When the AP connects a DPTX port to a Thunderbolt/USB4 tunnel, it gives the DCP firmware connection attributes: the DP IN role and HPD support. Those were the same for a tunnel on any host DP IN. On T6050 the attributes now also carry the host DP IN adapter the tunnel starts at, as its DFP port number (1..4 for DP IN 0..3, the target's core), in bits 15:13. This is set in dptxport_validate_connection() and dptxport_connect() alike. A direct PHY's attributes are unchanged, and so are other SoCs'.

Why

On the J714s dock, a display on the dock's second DP OUT worked only while its tunnel started at the host's DP IN 0. On DP IN 1 it trained, the sink raised IRQ_HPD shortly after the training, the DCP firmware terminated the video interface, and the driver relinked it, over and over. This didn't depend on the display engine (dcpext1 and dcpext2 both failed), on the sink, or on pairing.

Stacking

None in code: this applies to integration/aurora alone. It goes with #2038: the G81SF on DP IN 1 held its link only in k6, which added this and #2038 together. Neither was tested alone, so I can't say whether one of them would be enough. Please merge them together.

In the kits both ran with #1921, #2006 and the rest of this set.

Tested

  • k5 (without this and thunderbolt: run a T6050 host DP IN's bandwidth allocation as macOS does #2038): the G81SF on dock DP IN 1 is dark: 7 sink IRQ_HPD, each followed by the firmware dropping the sink, 3 relinks, then the driver gives up.
  • k6 (with both): no IRQ_HPD and no relink. The G81SF runs at 3840x2160@120 (DP-3, dcpext2), beside the Dell at 3840x2160@120, the JTG at 1920x1280@60 on DP IN 0 (DP-5, dcpext1) and the panel. Same at both read-outs. The JTG's DP IN 0 tunnel, which worked before, still does.

Compile: fedora-kcheck (cross build, M5 intg6 config): OK (vmlinux, Image and modules linked), 0 new warnings. checkpatch --strict: 0 errors; its one warning is the From/Signed-off-by name mismatch these commits always have.

Rig and kits

J714s (MacBook Pro 14", M5 Pro):

  • internal panel;
  • Dell S2725QC (3840x2160@120) on the left-front port, DP alt mode;
  • Thunderbolt 5 dock on the right port: JTG S123 (1920x1280@60) on DP IN 0, Samsung Odyssey G81SF (3840x2160, up to 240 Hz) on DP IN 1.

Each kit was integration/aurora 514ae1f + #2006 (which carries #1921) + #2018 as it was at 0521255 (its earlier PHY-side version) + the changes up to that row. Built natively on the M5, one-shot test boot, read-outs only (sysfs, debugfs, kernel log, hyprctl monitors), then the default kernel restored and verified byte-identical. Since 514ae1f, integration/aurora has gained only #2022, which touches none of these files. The k6 tree is the tree of all seven PRs of this set merged on #2006, apart from a diagnostic log commit used only in the kits and the serial keyword added to one log line in the EDID PR.

kit adds Dell (left-front) JTG (dock DP IN 0) G81SF (dock DP IN 1) DP IN 1 in the kernel log
stock (default kernel) 3840x2160@120 1920x1080@60, no EDID, no name dark
k2b EDID defaults, and an earlier tunnel clock restart not up in that boot ¹ 1920x1080@60 ², "JTG S123" dark 11 IRQ_HPD, 3 relinks, 5 failed paired mode sets
k3 + atc tunnel open, + tunnel-only first 3840x2160@120 1920x1280@60 dark 10 IRQ_HPD, 3 relinks, 4 failed paired mode sets
k4 + merged-mode limit 3840x2160@120 1920x1280@60 dark 8 IRQ_HPD, 3 relinks, 1 failed paired mode set
k5 + no paired call under the limit, + tunnel clock only for its link 3840x2160@120 1920x1280@60 dark 7 IRQ_HPD, 3 relinks, no failed paired mode set, no clock rate change
k6 + DPTX connection DP IN, + held CM Ack bandwidth allocation 3840x2160@120 1920x1280@60 3840x2160@120 no IRQ_HPD, no relink

The internal panel ran at 3024x1964@120 in every row. k6 was read at about 60 s and 150 s after boot, with the same result both times, and with no oops, WARN, DART fault or GPU fault.

¹ The left-front port's PD controller came up late in that boot and the Dell never entered DP alt mode. None of these changes touch that path.
² In k2b the JTG was on DP-1 and the compositor ran it at 1920x1080; from k3 on it is DP-5 at its native 1920x1280.

Neo rows needed

No. The new attribute bits are set only for an apple,t6050-dcpext DCP on a USB4 output. Every other DCP sends the same attributes as before.

🤖 Generated with Claude Code

On the J714s dock, a display on the dock's second DP OUT works only while
its tunnel starts at the host's DP IN 0. On DP IN 1 it trains, the sink
raises IRQ_HPD shortly after the training, the DCP firmware terminates
the video interface and the driver relinks it, over and over. This does
not depend on the display engine (dcpext1 and dcpext2 both fail), on the
sink, or on pairing, and, with the tunnel clock change of this series,
the PHY tunnel clock, the crossbar outputs and the DP IN block are set up
for DP IN 1 as macOS sets them up.

What the AP tells the firmware about the tunnel still differs. macOS
connects a DPTX port to a tunnel with connection attributes that, beyond
the DP IN role and HPD support, carry the host DP IN the tunnel starts
at, in bits 15:13: the same number as the target's DFP port, different
for DP IN 0 and DP IN 1. The driver left those bits clear, so to the
firmware the tunnels on both DP INs looked alike there.

Set them on T6050, in the validation and the connection call alike. A
direct PHY's attributes and other SoCs' are unchanged.

Tested only together with the DP IN bandwidth allocation change; with
both, the DP IN 1 display holds its link.

Signed-off-by: Diljit Singh <hey@djdev.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant