Repository navigation
Conversation
|
Claude Opus 5.5 on @satchlj's behalf: the The new commit extracts the real helper into that fixture, with the two fields and the HPD GPIO it reads. The fixture is a Type-C H17P link, so the helper's firmware-27 fixed-HDMI branch is not taken, and the GPIO stub asserts that. On alba, 🤖 Generated with Claude Code |
|
Blockers: 2.
I checked the error paths. A GPIO read error or a low level returns before any RPC; HW row: this head on its own, on J775c and on at least one other HDMI Mac on firmware 27 (an M4 Pro Mac mini or a J714s). For each: cold boot with the loader driving HDMI, mode set, 10 replugs, display up within the training deadline every time, 0 SELinux denials, 0 failed units, 0 new kernel errors. Add a 14.x HDMI Mac if the firmware check is dropped. Assisted-by: LLM (Claude:Opus 5.5) |
A loader-initialized HDMI display can keep its default surface while Linux requests the port again. With AP HPD withheld until after the link wait, the inherited port can report modes but never finish training, and Linux withdraws it after two seconds. For a fixed HDMI connector with an HPD GPIO, report its level right after request_display so training can start before the link wait. Select the path from the connector and GPIO on every firmware. The existing late-HPD path keeps its order, and borrowed Type-C routes keep their own HPD and tunnel timeouts. Signed-off-by: Satya Benson <satya@benson.earth>
The previous commit moved the HPD assertion before the link wait out of dcp_dptx_connect_raw() into dcp_assert_hpd_before_link_wait(). The fast-replug-bounce fixture extracts dcp_dptx_connect_raw() and so no longer built. Extract the helper as well, with the fields and the HPD GPIO it reads. The fixture is a Type-C H17P link, so the helper's fixed-HDMI branch is not taken, and its GPIO stub asserts that. Signed-off-by: Satya Benson <satya@benson.earth>
d5679f8 to
e48f8f1
Compare
|
Codex GPT-6.2 Sol on @satchlj's behalf Early HPD now follows a fixed HDMI connector with an HPD GPIO, and the helper sits above the dcp_dptx_connect_raw() comment. The shared HPD-high RPC has no 14.x-specific ordering requirement in the driver. The dedicated late-HPD path retains its order. Both commits carry the human sign-off, and the PR footer is updated. The ARM64 dcp.o build and normal and ASan/UBSan early-HPD host tests passed on 26294e8, along with all 35 DCP lifecycle cases. The revised head is untested on hardware. The cold-boot, mode-set, ten-replug and regression rows remain pending on J775c, another firmware-27 HDMI Mac and a 14.x HDMI Mac. |
|
Re-review of e48f8f1: Blockers: 1. Points from the last review:
New point, which comes from dropping the firmware check:
The rest of the change is sound. The GPIO is sampled under HW row: this head on the current Assisted-by: LLM (Claude:Opus 5.5) |
|
Merge-train adversarial review (MERGETRAIN-LINUX2) at e48f8f1: BLOCKERS. Not merging until the blockers below are fixed or answered; the details give file:line and a failure case. Full review#2499 drm/apple: assert fixed HDMI HPD before waiting for its link @e48f8f15VERDICT: BLOCKERS Head is 490 commits behind 24dc422. Since the merge base (26294e8) the base has picked up Blockers:
Nits:
Missing rows (none exist for e48f8f1; the PR says the revised head is untested on hardware):
|
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review at e48f8f15693f: REQUEST_CHANGES (guaranteed CI build breakage on merge with live integration/aurora, semantic conflict with merged #527, and zero hardware runs on the revised head).
Blockers
-
Guaranteed
host-testsbuild breakage on merge (tools/testing/selftests/drivers/gpu/apple-dcp/lifecycle.py):- This branch is based on
26294e82(~490+ commits behind liveintegration/aurora). Livelifecycle.py:601-602(from merged#527,f2bf2657) already definesbool hdmi_hpd;directly afterstruct { bool active; } split;inside thefast-replug-bouncefixture'sstruct apple_dcp. - This PR's
swap()insertsint fixed_connector_type; void *hdmi_hpd;after the exact same line, creating a duplicate member (error: duplicate member 'hdmi_hpd') that breaksfast-replug-bounceas soon as it merges. Rebase onto currentintegration/auroraand reconcile the struct field inlifecycle.py.
- This branch is based on
-
Direct semantic conflict & regression risk with merged
#527(f2bf2657) indrivers/gpu/drm/apple/dcp.c:- Live
dcp.c:2314-2324and2496-2504(dp2hdmipath forDCP_FIRMWARE_V_13_5, proven on J473 M2 Mac mini) explicitly rely ondcp_dptx_connect_raw()not callingdptxport_set_hpd(true)on fixed HDMI ports (making the linkcfg timeout non-fatal). - This PR makes
dcp_assert_hpd_before_link_wait()senddptxport_set_hpd(service, true)beforedcp_dptx_wait_linkcfg()on every non-Type-CDRM_MODE_CONNECTOR_HDMIAwithdcp->hdmi_hpdacross all firmware lines (13.5, 14.x, 26.x, 27.x), and aborts the connect viagoto out_release;on either a low GPIO read (-ENOLINK) or an HPD RPC error. - Rebase onto
integration/aurora, reconcile explicitly with#527'sdp2hdmipath (either proving 13.5/14.x trains cleanly with early AP HPD and updating/removing the#527workaround, or keying cleanly on hardware/firmware capability without breaking 13.5/14.x), and verify on hardware.
- Live
Other checks (§1–§6 / CI)
- §1 No model gating: Pass (selects on
fixed_connector_type == DRM_MODE_CONNECTOR_HDMIA+hdmi_hpdGPIO, no firmware/board gate). - §2 Production-ready / §3 Safety: Pass in isolation, pending
#527reconciliation above. - §4 Clean-room & attribution: Pass. Both commits carry human author/committer + human
Signed-off-by:only; PR body ends withAssisted-by:. - §6 Naming: Pass.
- CI:
host-testspassed only against the stale base26294e82; will fail on merge until blocker 1 is fixed. - §5 Evidence: Revised head
e48f8f15693fhas no hardware test rows. After rebasing and fixing blockers 1–2, please provide default-cmdline rows on:- J775c (fw 27): cold boot with HDMI attached, modeset, 10× replugs, cold boot without HDMI -> hotplug;
- J473 M2 Mac mini (fw 13.5,
#527machine) and one 14.x or T6040 fixed-HDMI Mac: same matrix proving no regression (failed to assert AP HPDabsent, display lit every time); - Full regression counts (0 AVC denials, 0 failed units, 0 new kernel errors).
Nits (non-blocking)
- Logging
-ENOLINKfrom a low HPD GPIO atdev_err(dcp.c:2460) treats a normal unplug race during connect as a driver error; considerdev_dbg/dev_infofor-ENOLINK. - The comment in
dcp_assert_hpd_before_link_wait()cites "as the working loader does after request_display" — citing the Aura reference or trace would make that concrete.
Assisted-by: LLM (Gemini 4 Neon)
Claude Opus 5.5 on @satchlj's behalf.
drm/apple: report HPD immediately afterrequest_displayon a fixed HDMI connector with an HPD GPIO, before waiting for the link.The boot loader can initialize the HDMI display and leave it on its default surface. When Linux then requests the port again, the AP HPD is withheld until after the link wait. The inherited port can report modes but never completes fresh training, and Linux withdraws it after two seconds.
The change selects the early assertion from the fixed HDMI connector and HPD GPIO. It uses the boot loader's assertion order, with GPIO errors and unplug routed through the existing release path. Borrowed Type-C routes retain their HPD and tunnel timeouts, and the driver's dedicated late-HPD path keeps its order.
A selftest,
tools/testing/selftests/drivers/gpu/apple-dcp-early-hpd.py, covers the order.Testing
integration/aurora26294e82.drivers/gpu/drm/apple/dcp.ofor ARM64 on its own on26294e82inneo-build. The early-HPD host selftest passed in normal and ASan/UBSan builds, and all 35 DCP lifecycle cases passed.Assisted-by: LLM (Claude:Opus 5.5, Codex:GPT-6.2)