Repository navigation
arm64: dts: apple: t8122-j615: Show the software camera indicator (slot 3) - #2717
Conversation
…ot 3) The 15-inch M3 MacBook Air has no camera indicator light. Opt it into the best-effort software indicator: apple,camera-indicator-surface on the DCP and apple,camera-indicator on the ISP. On 27.2 firmware the J615 DCP has no apple,iomfb-surfaces, so DRM owns swap slots 0 and 1 and the indicator needs slot 2 or 3. With slot 2 the indicator does not change the composited frame under the desktop; with slot 3 it does, and the frame returns to the camera-off one at stop. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Rows from "Still to run": J615,
|
|
Merge-train adversarial review (MERGETRAIN-LINUX2) at 75bd323: NO BLOCKERS. Code read only, nothing built here. Before the merge it still needs Dj's verdict at this head; the missing rows are listed below. Full review#2717 arm64: dts: apple: t8122-j615: Show the software camera indicator (slot 3) @75bd3233VERDICT: NO BLOCKERS The change is DT only and J615 only: arch/arm64/boot/dts/apple/t8122-j615.dts:21-25 and :37-39. Nits:
Missing rows: a panel photo, as the PR itself lists. A row with DRM actively using slot 1 (an overlay plane in use) while the camera streams. J613 is not opted in, so no row is needed there. |
DjDeveloperr
left a comment
There was a problem hiding this comment.
Adversarial review at 75bd32335ca4 against pre-pr-checklist.md.
Checklist verification
- §1–§3 (No model gating / production readiness / DT correctness): Clean. DT-only opt-in on
arch/arm64/boot/dts/apple/t8122-j615.dts(apple,camera-indicator-surface = <3>on&dcp,apple,camera-indicator = <&dcp>on&isp), matching the DT-driven design from #2561 and #2651 with no kernel gates, cmdline parameters, or hacks. Verified againstdrivers/gpu/drm/apple/dcp.c:7372-7376,dcp-indicator.c:55-69,dcp-internal.h:48(DCP_MAX_PLANES = 4), andDocumentation/devicetree/bindings/display/apple,dcp.yaml:195-204: withoutapple,iomfb-surfaces, DRM owns slots 0–1 on 27.x firmware (top_surf = 1) and slot 0 on 14.7/26.6 (top_surf = 0), so slot 3 passessurf < SWAP_SURFACES && surf > top_surfon both firmware lines. - §4 & §6 (Attribution / clean-room / naming): Clean. Human author/committer (
Ryan Murray <ryan@aurorasilicon.org>) and humanSigned-off-by:only; zero AI trailers in the commit;Assisted-by:present in the PR body. - §5 (CI & hardware evidence): Complete on the live head.
dt-checksandhost-testsare green. J615 hardware runs on7.3.0-aurora-fleet78(stock modules, default cmdline, DTB verified to differ only by these two properties + phandle) cover ISP probe, DRM plane state (48×48 AR24 at+2820+12,plane_mask1→5), blend-CRC off/on/off 3/3 (differentiating slot 3 from slot 2), DPMS off/on 3/3, camera start while display off 3/3, 20 s s2idle with camera streaming, and full regression (0 errors, 0 swap failures, 0 dropped presents, 0 failed units, SELinux enforcing).
Non-blocking follow-ups
- A physical panel photo and a test with DRM actively using overlay slot 1 (direct scanout / fullscreen video) while streaming would be nice follow-ups to confirm slot 3 stays above active slot 1.
- Pre-existing:
apple,t8122-isphas no DT schema yet, sodtbs_checkonly validates&dcp; also, if a future loader ever enables slot 3 inapple,iomfb-surfaces,dcp_indicator_probe()returning-EINVALfails DCP probe (#2561 behavior, worth softening in a separate driver follow-up).
Assisted-by: LLM (Gemini 4 Neon)
Problem. The 15-inch M3 MacBook Air (J615) has no camera indicator light. #2561 added a best-effort software indicator that the DCP draws in a reserved swap slot, but J615 doesn't opt in.
Change. DT only, J615 only:
apple,camera-indicator-surface = <3>on the DCP andapple,camera-indicator = <&dcp>on the ISP. The J615 DCP has noapple,iomfb-surfaces, so on 27.2 firmware DRM owns slots 0 and 1, and the indicator needs slot 2 or 3. Slot 2 does not show under the desktop (the same result as on the J700, #2651). Slot 3 does.Testing. J615 on its production kernel
7.3.0-aurora-fleet78(carries #2561 and the J615 DCP driver), stock modules, default command line. Each trial was a one-shot boot whose only change was these two properties in the J615 DTB. The rows read the DCP blend CRC with the camera off, streaming, and off again, under GNOME, with the panel backlight at 0.best-effort software camera indicator via the DCPat ISP probe, with 0 errors, 0 failed units, and SELinux enforcing.dtbs_checkreports 0 warnings, the same as the base. checkpatch--strictis clean. Built from the J615's own production DTB source (fleet78 + arm64: dts: apple: t8122-j613-j615: describe the Touch ID data-ready line #2678) plus this commit, the DTB differs from the one it boots only by these two properties and the DCP phandle they need.Still to run.
Notes for review
dcp_indicator_probe()enforces that.Assisted-by: LLM (Claude:Opus 5.5)