Skip to content

Move the upstream baseline to drm-cxx 5e7047b - #128

Merged
jwinarske merged 1 commit into
mainfrom
chore/baseline-5e7047b
Oct 20, 2026
Merged

jwinarske merged 1 commit into
mainfrom
chore/baseline-5e7047b

Conversation

@jwinarske

Copy link
Copy Markdown
Owner

This moves the parity baseline from drm-cxx 2b260d0 to 5e7047b, which is v5.0.0 plus the merge of drm-cxx#386.

All 12 upstream commits to src/ in 2b260d0..5e7047b are now in drmkit:

Also here, ahead of its upstream merge: the cursor's overlay pick skips multirect virtual planes, as drm-cxx#387 does. The drm-cxx session hit one on the SA8155P ("r1 only virt plane"). Folded in here to save a separate CI run (P-108). a_multirect_virtual_plane_is_not_picked_for_the_cursor fails without it.

Baseline pins moved:

  • the CI drift lane's checkout (full SHA);
  • TEST_PARITY.md tracked tree;
  • INVARIANTS.md;
  • both READMEs;
  • the workspace manifest;
  • drmkit::UPSTREAM_BASELINE.

TEST_PARITY.md gains rows for upstream's three new test files:

  • test_plane_clip.cpp;
  • test_cursor_overlay_clip_vkms.cpp, which notes the agreed P-101 divergence;
  • test_dumb_buffer_vkms.cpp.

All three are ported. The README status counts follow: 111 files, 78 ported, 14 partial, 3 not applicable, 16 pending.

Checks: cargo xtask check against 5e7047b passes (111 files, all mapped), as do clippy over the workspace with all features, workspace tests, the scene and cursor tests on vkms, and the rustdoc matrix.

All twelve upstream commits to src/ in 2b260d0..5e7047b are now in the
port: ten by #116, #118, #119, #123-#127 and earlier fixes the port made
first, and the two from drm-cxx#386, the fix for #384, here.

That fix's scene clip matched drmkit's P-100 clip but for the formats it
skips. Upstream skips a list of chroma-subsampled formats; drmkit
admitted only formats with one bits-per-pixel value, so 4:4:4 YUV such
as NV24 kept a negative position. clips_cleanly now uses upstream's list
and clip_leading its guard against a source extent past 32 bits, pinned
by upstream's PlaneClip cases (P-107). Its cursor zpos rule is #127's.

The cursor's overlay pick also skips multirect virtual planes, as
drm-cxx#387 does, ahead of its merge: the SA8155P refuses one unless its
parent is armed (P-108).

TEST_PARITY.md gains rows for upstream's three new test files, all
ported, and its tracked tree moves with the CI drift pin. The baseline
moves in INVARIANTS.md, the READMEs, the workspace manifest and
drmkit::UPSTREAM_BASELINE; the README's status counts follow.

Signed-off-by: Joel Winarske <joel.winarske@linux.com>
@jwinarske
jwinarske merged commit d02c8ed into main Oct 20, 2026
10 checks passed
@jwinarske
jwinarske deleted the chore/baseline-5e7047b branch October 20, 2026 19:50
@jwinarske jwinarske mentioned this pull request Oct 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant