Repository navigation
drm/apple: keep a DP2HDMI connect when no link configuration arrives - #527
Conversation
RyanTheTide
left a comment
There was a problem hiding this comment.
This no longer merges into integration/aurora. dcp_dptx_connect_raw() gained a bool t8132 = dcp_is_t8132_ext(dcp); declaration next to late_hpd, and that conflicts with the new dp2hdmi declaration. Keeping both declarations resolves it. Could you rebase onto the current integration/aurora?
The change looks fine otherwise. Only the timeout branch changes, so a DP2HDMI output that does get its link configuration behaves as before. Type-C outputs stay out of the predicate.
810c259 to
5738484
Compare
|
Rebased onto current Only the timeout branch changed; |
5738484 to
1101aaa
Compare
|
Blockers: 1.
Nit: HW row: M2 mini (13.x) plus one more DP2HDMI Mac (e.g. M1 mini or a 14" MBP), same Assisted-by: LLM (Claude:Opus 5.5) |
8522e52 to
ff07118
Compare
|
Status so this isn't waiting on me silently. The patch is I compiled The HW row is still owed. I don't have a second DP2HDMI Mac and I won't have |
|
( Assisted-by: LLM (Claude:Opus 5.5) |
A DP2HDMI output asserts its own HPD in dcp_enable_dp2hdmi_hpd(), and the connect asks the firmware for HPD only on a DisplayPort connector or a late-HPD path, so an HDMI output's firmware is never asked to detect the sink and never sends the link configuration that dcp_dptx_connect() waits for. The wait can only time out there, and the display is withdrawn before it is ever lit. Continue as the late-HPD case already does instead of failing the connect. The existing `compact` case tolerates the same timeout, but it covers the 26.x firmware's compact endpoints, not a 13.x DP2HDMI output, and the new branch is limited to the 13.5 firmware line the failure was seen on. Seen on a Mac mini (t8112, G14, DP2HDMI out): the DCP boots, reports "DP2HDMI HPD connected:1" and 32 modes, then dcp_dptx_connect: timed out waiting for port 0 link configuration display HPD removed ... set_device_enabled_gated: requested state: 0 and the machine registers a DRM device with no output. With this change the same machine sets the mode and stays up: set_digital_out_mode(...) "3440x1440": 100 ... 3440 ... 1440 ... set_digital_out_mode finished:7866 Tested on that machine only (M2 mini, t8112, firmware-compat 13.x); the T6030/T8122/H17P paths, the compact 26.x path and every firmware line above 13.5 are untouched, and dcp_is_typec_output() keeps Type-C connects where they are. tools/testing/selftests/drivers/gpu/apple-dcp: fast-replug-bounce compiles dcp_dptx_connect_raw() against its own struct apple_dcp and firmware constants, so give that fixture hdmi_hpd and DCP_FIRMWARE_V_13_5. Signed-off-by: twobip <github@twobip.com>
ff07118 to
f2bf265
Compare
|
Fixed the fixture: |
5f5ac0c
into
aurora-silicon:integration/aurora
drm/apple: keep a DP2HDMI connect when no link configuration arrives
On a Mac mini (t8112, G14) with a DP2HDMI output,
appledrmnever gets thedisplay up: the DCP boots and reads the sink's modes, HPD is asserted, and then
dcp_dptx_connect()times out waiting for a link-configuration notificationthat this firmware does not send. The timeout is treated as fatal, so the
connect is withdrawn and the machine ends up with a registered DRM device and
no output.
Note that
dcp_dptx_connect()already tolerates this timeout twice, for thecompact26.x endpoints and for the late-HPD case; this adds the third case itwas missing, a 13.x DP2HDMI output.
A DP2HDMI output asserts its own HPD in
dcp_enable_dp2hdmi_hpd(), so on thatpath the link-configuration wait can only time out; the driver already has the
"proceed without the notification" behaviour for the late-HPD case
(
dcp_ext_dptx_607()). This extends it to DP2HDMI outputs, identified by havingthe HPD GPIO and not being a Type-C output, so Type-C connects keep their
existing path.
With the change, the same machine sets a mode and stays up:
and the compositor reports
HDMI-A-1 3440x1440 @ 100.Scope
apple,firmware-compat13.x — the pre-26.x firmware line, so this is unrelated to the desktop 26.x /
T6041 work in drm/apple: T6041 (M4 Pro/Max) displays on desktop 26.6 firmware (carries #445) #446.
late_hpdanddcp_ext_dptx_607()behave exactly as before, anddcp_is_typec_output()keeps Type-C outputs out of the new branch.
unchanged in
integration/auroraas of99dac994,t8112-dcpextstill fallsthrough to the generic
apple,dcpextdata, and the recent "desktop" commitsare about 26.x firmware and T6040/T6041, not this path.
It would be worth a second opinion on the predicate from someone who knows why
T8122 asserts HPD after the wait — if another property identifies "this
firmware never notifies" more precisely, that would be a better condition than
the HPD GPIO and the Type-C check.
Assisted-by: LLM (DeepSeek:V4.1-Flash)