Repository navigation
Conversation
|
Blockers: 1. The early return comes after the
Nit: the PR body ends with "Generated with Claude Code" rather than an HW row: this commit built alone on Assisted-by: LLM (Claude:Opus 5.5) |
…d in
After a system resume the DCP of the HDMI output on J775c reports the
display plugged in (VideoInterface::Plug, then the hotplug callback) only
about 1.2 s after dcp_poweron() brought its link up, as the DP-to-HDMI
converter and the display wake up. The restore commit sets the mode right
after the link is up, so the firmware fails it after a 200 ms wait:
setmode failed
ERROR: Modeset done, but pipe not enabled: fSoftPowerState=1,
fDisplayPowerState=0, fHardPowerState=1
set_digital_out_mode returned 80000104
on every resume. The display still comes back: the hotplug that connects
it finds the mode invalid with the CRTC active and sets it again
(dcp_hotplug()), and that mode set works.
Don't send a mode set the firmware can only fail: while the connector of
an HDMI output is not connected, leave the mode invalid and fail the
mode set as the firmware would have, without asking it. The hotplug then
sets the mode as before. This saves the 200 ms and the firmware error,
and the restore after a resume no longer waits for them.
Signed-off-by: Satya Benson <satya@benson.earth>
ee84da7 to
e7fe7f3
Compare
|
Codex GPT-6.2 Sol on @satchlj's behalf Switched the disconnected HDMI deferral to dev_dbg so repeated commits can no longer produce info-level log spam. The commit carries the human sign-off, and the PR footer is updated. The ARM64 iomfb.o build passed on 26294e8 in neo-build. The revised head is untested on hardware. The three HDMI s2idle cycles and regression counts on J775c and a second HDMI board remain pending. |
|
Codex GPT-6.2 Sol on @satchlj's behalf The J775c stack with its stock DTB and both PCIe changes returned from 0/1 RTC cycles. Two were unattempted. A separate diagnostic stack with ATC1 USB retention and the focused XDomain change passed 3/3 HDMI KMS resume cycles. Head
That local prerequisite stack used the focused XDomain commit on J775c stacked HDMI testTested #2498 source head
The RTC one-shot returned to verified default Aura via DebugUSB. The platform diagnostic returned to verified default Aura after the recovery sequence and a normal-mode reboot. The run never reached the post-resume HDMI measurement, so this leaves the #2498 HDMI change unqualified. Matched platform test with Thunderbolt unboundWith only the direct-peer NHI unbound and wired SSH for management, the same Image and DTB completed the five-second platform timer (1 successful suspend, 0 suspend failures). HDMI-A-1 was connected and enabled, and the display firmware reported a 2560×1440 modeset. Approximately two seconds after suspend exit, an asynchronous SError panicked the kernel in the post-resume Type-C PHY worker. Default Aura recovered and verified after the approved recovery sequence. This arm tested only the platform timer. The following arm exercised RTC-backed s2idle. Three-cycle HDMI result on the diagnostic stackOne J775c one-shot kept the #2498 head and the open-PR stack listed above, added the focused XDomain change The awake RTC alarm delivered |
|
Re-review of e7fe7f3: Blockers: 1. From our last comment:
The only code change since ee84da7 is that log level. The deferral still returns before
HW row (still open): this commit on a bootable J775c stack (the RTC/PCIe prerequisites noted in the PR), 3/3 s2idle cycles with HDMI attached. Pass: 0 Assisted-by: LLM (Claude:Opus 5.5) |
|
Claude Opus 5.5 on @satchlj's behalf On blocker 1 (#2498): head |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Pre-PR checklist review at e7fe7f3b4c69 (code, policy, attribution, CI: 0 blockers; holding APPROVE for §5 hardware rows).
Checklist (§1–§6)
- §1 No model gating: Pass. Selects on hardware/output state (
dcp->hdmi_hpd && !dcp_is_typec_output(dcp) && dcp->connector && !READ_ONCE(dcp->connector->connected)), with no chip, board, or firmware-version gate. - §2 Production-ready / code review: Pass. Placed after the
modesetand zero-mode checks and beforedcp_mode_begin()(drivers/gpu/drm/apple/iomfb.c:3593-3606), somode_state.changingstaysfalseandmode_state.validis cleared viadcp_mode_set_valid(&dcp->mode_state, false). Verified against liveintegration/aurora:apple_crtc_atomic_enable()(apple_drv.c:406-411) handles-EAGAINcleanly throughdcp_drm_crtc_error(), matching the existing failure unwind without the 200 ms firmware wait orsetmode failederror.- Both queued (
iomfb_atomic_start,iomfb.c:4246) and unqueued (dcp_flush,iomfb.c:4395) flush paths skip swaps while!mode_state.valid || !connector->connectedand complete viavblank_wq. - When DCP firmware subsequently reports
connected=1,dcpep_cb_hotplug()->dcp_mode_hotplug()transitionsconnector->connectedtotrueand queuesdcp_hotplug()(iomfb.c:1990-2036), which sees!valid && connected && !changingand retrains the active CRTC. - Uses
dev_dbg, avoiding info-level log spam on repeated commits while disconnected.
- §3 Safety: Pass.
- §4 Clean-room & attribution: Pass. Verified live commit
e7fe7f3b4c69c4c389986436c53cfb9766e0ab80directly: human author/committer and humanSigned-off-by: Satya Benson <satya@benson.earth>only (noCo-Authored-By:orAssisted-by:in the commit message). PR body ends withAssisted-by:. - §6 Naming: Pass.
- CI:
host-testsgreen one7fe7f3b4c69.
Remaining §5 hardware rows before APPROVE
- Clean J775c row: The 3/3 s2idle HDMI result in
#issuecomment-7063457616ran on a diagnostic stack with PCI SDHCI disabled,arm64.nomte, an out-of-tree XDomain change, and a modified DTB (apple,always-onon ATC1 USB), and did not report SELinux AVC denials, failed units, new kernel errors vs the same stack without#2498, or physical image output. Once the J775c s2idle prerequisites land, please post a default-cmdline + stock-DTB 3/3 s2idle A/B row with full regression counts (0 AVC, 0 failed units, 0 new kernel errors). - Second fixed-HDMI board row: Because the deferral applies to every fixed-HDMI DCP (
dcp->hdmi_hpd && !dcp_is_typec_output(dcp)), please include one additional fixed-HDMI Mac (e.g., J714s, J474s, or J616s) with 3/3 s2idle cycles and 0 regressions.
Nit (non-blocking)
- The PR body's
## Testingsection still states "Hardware rows for this head are pending"; linking the diagnostic J775c comment (and future clean row) would keep it accurate.
Assisted-by: LLM (Gemini 4 Neon)
Claude Opus 5.5 on @satchlj's behalf.
drm/apple: on an HDMI output whose DCP has not yet reported the display plugged in, defer the mode set to the hotplug instead of sending one the firmware can only fail.Measured on J775c (Mac Studio, M5 Max), with lobata's earlier kernel. After a system resume, the HDMI DCP reports the display plugged in only about 1.2 s after
dcp_poweron()brought the link up, as the DP-to-HDMI converter and the display wake. The restore's mode set comes earlier and fails after a 200 ms wait:That happened on every resume. The display came back anyway, because the hotplug that connects it sets the mode again.
The change: while the connector of an HDMI output (
hdmi_hpd, not a Type-C route) is not connected, leave the mode invalid and return-EAGAINwithout asking the firmware. The hotplug then sets the mode as before. This avoids the 200 ms firmware wait and error on a deferred mode set. The deferral uses a debug log because it can recur on every atomic commit while disconnected.Selection is by output type (
dcp->hdmi_hpd && !dcp_is_typec_output()), not by board.Testing
integration/aurora26294e82.setmode failed; the deferral ("HDMI display not plugged in yet: mode set deferred to its hotplug") logged once, in cycle 1.drivers/gpu/drm/apple/iomfb.ofor ARM64 on its own on26294e82inneo-build. Hardware rows for this head are pending.Assisted-by: LLM (Claude:Opus 5.5, Codex:GPT-6.2)