Repository navigation
Move the upstream baseline to drm-cxx 5e7047b - #128
Merged
Merged
Conversation
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>
Merged
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.
This moves the parity baseline from drm-cxx
2b260d0to5e7047b, which is v5.0.0 plus the merge of drm-cxx#386.All 12 upstream commits to
src/in2b260d0..5e7047bare now in drmkit:zposrule is identical to Stack the cursor's plane at the top of what the CRTC blends (P-106) #127's.NV24kept a negative position.clips_cleanlynow uses upstream's list, andclip_leadinggets its guard against a source extent past 32 bits (P-107).PlaneClipcases are ported asplane_clip_*. TheNV24case fails against the old rule.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_cursorfails without it.Baseline pins moved:
TEST_PARITY.mdtracked tree;INVARIANTS.md;drmkit::UPSTREAM_BASELINE.TEST_PARITY.mdgains 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 checkagainst5e7047bpasses (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.