Repository navigation
drm/apple: stamp the swaps of every 14.7 ProMotion panel - #2805
Draft
RyanTheTide wants to merge 2 commits into
Draft
RyanTheTide wants to merge 2 commits into
RyanTheTide wants to merge 2 commits into
Conversation
On a J514S (MacBook Pro 14", M3 Pro) the internal panel is set to its 3024x1890@120 timing, but swaps complete 16.64 ms apart and Wayland frame callbacks run at about 60 fps. The T6030 board record, which serves the J514S and J516S, has promotion but not swap_timestamps, so its swaps go out with zero timestamps. With zero timestamps the 14.7 firmware completes at most one swap per 16.7 ms, the behaviour 47d53ce ("drm/apple: stamp the J516C panel's 14.7 swaps") fixed on the J516C. The J514C record has the same gap: it runs the J516C's own DCP image, where stamping was measured, on a 120 Hz panel. Set swap_timestamps in the T6030 and J514C records. Every 14.x board record with a 120 Hz panel now stamps its internal swaps with the constant deadline, as the template path (fa13cbd) and the M4 path (09986ee) do for their 120 Hz panels. The 60 Hz J613/J615 panels and the external processors keep zero timestamps, byte for byte. The board KUnit case now checks the J514S, J516S, J514C, J516C, J613 and J615 records, and that swap_timestamps follows promotion on each. Not tested on M3 hardware: no J514S, J516S or J514C was available. The J516C result and the reporter's measurements are the evidence; the reporter's test of this change on a J514S is the check. Reported-by: fraudsta (Discord: thetennisfan) Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
swap_timestamps was set on exactly the records that have promotion, and the KUnit case asserted that the two are equal. A separate flag only leaves room for the next 120 Hz record to miss it, which is how the T6030 and J514C records lost their stamps. Decide it in dcp_v14_board_stamps_swaps() from board->promotion and drop the field. No record changes behaviour: the three records that stamped still do, and the 60 Hz T8122 records still don't. The KUnit case now checks the ProMotion bits and that the stamp decision follows them. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
DjDeveloperr
requested changes
Nov 22, 2026
DjDeveloperr
left a comment
Contributor
There was a problem hiding this comment.
Reviewed at 2506e1647580b8f0548cb3e76a0112fb034274d5 against pre-pr-checklist.md (§1–§6).
0 code blockers. The code and tests are clean:
- §1 / §2 / §3: Dropping the redundant per-board
swap_timestampsboolean and deriving swap stamping fromboard->promotionindcp_v14_board_stamps_swaps()(drivers/gpu/drm/apple/iomfb_v14_7.c:1710-1713) removes the per-board drift that left T6030 (J514S/J516S) and J514C unstamped at 60 fps. External processors and 60 Hz T8122 panels (J613/J615) keep zero timestamps byte-for-byte, and ProMotion panels stamp constantDCP_V14_SWAP_TIMESTAMP_VALUE(120) in slots 0, 1, and 6 matching J516C (47d53ce42303). - Tests & CI: KUnit
v14_board_swap_timestampscovers J514S, J516S, J514C, J516C, J613, J615, external role, andNULLboard;host-testsCI passes at2506e1647580. - §4 & §6: Both commits (
1882f3be6ee2,2506e1647580) carry human author/committer andSigned-off-by:only (zero AI commit trailers); naming clean.
Blocker before approval (§5 hardware evidence)
- This is a non-draft PR with no hardware run yet on any newly enabled M3 Pro/Max panel (
J514S,J516S, orJ514C). Before merge (or convert back to draft until a tester row lands), please attach a J514S or J516S hardware row at2506e1647580on the default command line confirming:- 120 Hz mode (
3024x1890@120on J514S /3456x2234@120on J516S):dcp:iomfb_swap_completeintervals ~8.33 ms andwl_surface.frame~120 fps; - 60 Hz mode: ~16.67 ms unchanged;
- System regression counts:
0SELinux denials,0failed units,0new kernel errors.
- 120 Hz mode (
Non-blocking notes
- The PR description still cites the superseded
#1632commit SHA983f5f98in two places ("second commit, 983f5f9" and "At 983f5f9"); please update those to2506e1647580. - Note overlap with open PR
aurora-silicon/linux#1969(drm/apple: t6030: swap timing words and early flip for 120 Hz) when coordinating merge order.
Assisted-by: LLM (Gemini 4 Neon)
RyanTheTide
marked this pull request as draft
November 22, 2026 13:18
Contributor
Author
|
Looking for a row from anyone with a J514S or J516S (M3 Pro), or a J514C (M3 Max 14"). There's none in our lab. Test kernel at this head (2506e16), Fedora Aurora 44 and 45 RPMs: https://github.com/aurora-silicon/linux/releases/tag/untagged-8afc8a87f355fb09576d (install notes and SHA256SUMS on the page). What to check, default command line:
The M1 Pro/M2 and M4 Pro paths don't use these board records, so they can't stand in for this row. Assisted-by: LLM (Claude:Opus 5.5) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces #1632 (same changes, commit trailers fixed, on the current integration/aurora).
Problem
On a J514S (MacBook Pro 14", M3 Pro) the internal panel is set to 3024x1890@120 (804.56 MHz, htotal 3104, vtotal 2160), and GNOME shows 120 Hz. The panel still presents at 60 fps: apple-dcp swap completions are 16.64 ms apart and
wl_surface.framecallbacks run at about 60.25 fps.The J514S and J516S DCP (
apple,t6030-dcp) binds the T6030 board record, which haspromotionbut notswap_timestamps. Its swaps go out with zero timestamps, and with zero timestamps the 14.7 firmware completes at most one swap per 16.7 ms. 47d53ce fixed the same thing on the J516C. The J514C record has the same gap: it runs the J516C's DCP image on a 120 Hz panel.Fix
Decide the stamping from the record's
promotionbit indcp_v14_board_stamps_swaps()and drop the separateswap_timestampsfield (second commit, 2506e16), so every 14.x record with a 120 Hz panel stamps its internal swaps with the constant deadline the J516C uses. The template path (fa13cbd) and the M4 path (#1525) already do this for their 120 Hz panels. The 60 Hz J613/J615 panels and the external processors keep zero timestamps, byte for byte.Audit of the other 120 Hz internal panels
needs_timestampsTests
apple-dcp-v14-board: the J514S, J516S, J514C and J516C records stamp their internal swaps; J613, J615, the external role and no record do not; the stamp decision equalspromotionon every record. At 2506e16:apple-dcp*suites 22/22 on arm64 (qemu, LLVM, 16K), and a mutant that never stamps failsv14_board_swap_timestamps. W=1 and checkpatch --strict are clean.test/dcpm3-m3-pro-120hz).Reported by fraudsta on the Aurora Discord, with the swap and frame-callback measurements above.
Native hardware qualification
On J514S or J516S at
2506e1647580, verify 120 Hz swap completion at about 8.33 ms and Wayland frame callbacks at about 120 fps, then verify 60 Hz swap completion at about 16.67 ms. Use the default command line and record new kernel errors, SELinux denials and failed units.Assisted-by: LLM (Claude:Opus 5.5)