From: Mike Lothian <mike@fireburn.co.uk>
To: rust-for-linux@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Danilo Krummrich" <dakr@kernel.org>,
"Lyude Paul" <lyude@redhat.com>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Boqun Feng" <boqun@kernel.org>, "Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
linux-kernel@vger.kernel.org,
"Mike Lothian" <mike@fireburn.co.uk>
Subject: [RFC PATCH v2 18/18] rust: drm: kms: add plane damage-clip accessors
Date: Fri, 3 Jul 2026 04:01:05 +0100 [thread overview]
Message-ID: <20260703030123.2814-19-mike@fireburn.co.uk> (raw)
In-Reply-To: <20260703030123.2814-1-mike@fireburn.co.uk>
A driver whose "scanout" is an expensive encode-and-send (like a USB
display) wants to repaint only the region a client marked dirty rather
than the whole framebuffer every flip. Add two RawPlaneState accessors
over the client's FB_DAMAGE_CLIPS (relative to the old plane state), both
intersected with the visible source area:
- damage_merged(), wrapping drm_atomic_helper_damage_merged(): merges the
clips into one rectangle and returns it as a new Rect type (with
width()/height() helpers). None means nothing to repaint; if the client
supplied no clips, the full plane rectangle is returned, so a driver can
always treat Some as "repaint this box".
- for_each_damage_clip(), driving drm_atomic_helper_damage_iter: invokes a
closure once per individual clip (the rectangles damage_merged() collapses
into one), so a driver that forwards each changed region separately -- e.g.
over USB -- can repaint just those rectangles instead of their bounding box.
drm_atomic_helper_damage_{merged,iter_*} live in <drm/drm_damage_helper.h>,
so add that to bindings_helper.h.
Signed-off-by: Mike Lothian <mike@fireburn.co.uk>
Assisted-by: Claude:claude-opus-4-8 [Claude-Code]
---
rust/bindings/bindings_helper.h | 1 +
rust/kernel/drm/kms/plane.rs | 105 ++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 7d04abec1215..b8675642c1a8 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -39,6 +39,7 @@
#include <drm/drm_atomic_helper.h>
#include <drm/drm_connector.h>
#include <drm/drm_crtc.h>
+#include <drm/drm_damage_helper.h>
#include <drm/drm_blend.h>
#include <drm/drm_edid.h>
#include <drm/drm_encoder.h>
diff --git a/rust/kernel/drm/kms/plane.rs b/rust/kernel/drm/kms/plane.rs
index ead875316829..4ae11cec88a4 100644
--- a/rust/kernel/drm/kms/plane.rs
+++ b/rust/kernel/drm/kms/plane.rs
@@ -605,6 +605,49 @@ pub trait FromRawPlaneState: AsRawPlaneState {
unsafe fn from_raw_mut<'a>(ptr: *mut bindings::drm_plane_state) -> &'a mut Self;
}
+/// A rectangle in a plane's source (pixel) space, as produced by
+/// [`RawPlaneState::damage_merged`].
+///
+/// The box is inclusive on the top-left and exclusive on the bottom-right (`[x1, x2)` by
+/// `[y1, y2)`), matching [`struct drm_rect`].
+///
+/// [`struct drm_rect`]: srctree/include/drm/drm_rect.h
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct Rect {
+ /// Left edge, inclusive.
+ pub x1: i32,
+ /// Top edge, inclusive.
+ pub y1: i32,
+ /// Right edge, exclusive.
+ pub x2: i32,
+ /// Bottom edge, exclusive.
+ pub y2: i32,
+}
+
+impl Rect {
+ #[inline]
+ fn from_raw(r: &bindings::drm_rect) -> Self {
+ Self {
+ x1: r.x1,
+ y1: r.y1,
+ x2: r.x2,
+ y2: r.y2,
+ }
+ }
+
+ /// The width of the rectangle in pixels.
+ #[inline]
+ pub fn width(&self) -> i32 {
+ self.x2 - self.x1
+ }
+
+ /// The height of the rectangle in pixels.
+ #[inline]
+ pub fn height(&self) -> i32 {
+ self.y2 - self.y1
+ }
+}
+
/// Common methods available on any type which implements [`AsRawPlane`].
///
/// This is implemented internally by DRM, and provides many of the basic methods for working with
@@ -691,6 +734,68 @@ fn atomic_helper_check<S, D>(
})
}
+ /// Merge all frame-damage clips on this (new) plane state -- relative to `old` -- into a
+ /// single bounding rectangle, intersected with the plane's visible source area.
+ ///
+ /// Returns [`None`] when the plane is not visible or there is nothing to update. If the client
+ /// supplied no explicit damage clips, the full plane rectangle is returned, so a driver can
+ /// always treat [`Some`] as "repaint this rectangle" and fall back to a full-frame update.
+ /// Coordinates are integer pixels in the plane's source space.
+ ///
+ /// [`drm_atomic_helper_damage_merged`]: srctree/include/drm/drm_damage_helper.h
+ fn damage_merged(&self, old: &impl AsRawPlaneState) -> Option<Rect> {
+ let mut rect = bindings::drm_rect {
+ x1: 0,
+ y1: 0,
+ x2: 0,
+ y2: 0,
+ };
+
+ // SAFETY:
+ // - `old` and `self` are valid initialized `drm_plane_state`s via their type invariants.
+ // - `drm_atomic_helper_damage_merged` only reads the two states (to gather the damage
+ // clips and the source rectangle) and writes the merged result into `rect`; it does not
+ // mutate the plane state, so deriving a `*mut` from our shared reference is sound.
+ let visible = unsafe {
+ bindings::drm_atomic_helper_damage_merged(
+ core::ptr::from_ref(old.as_raw()),
+ core::ptr::from_ref(self.as_raw()).cast_mut(),
+ &mut rect,
+ )
+ };
+
+ visible.then(|| Rect::from_raw(&rect))
+ }
+
+ /// Invoke `f` once per frame-damage clip on this (new) plane state relative to `old`, each
+ /// intersected with the plane's visible source area -- i.e. the individual rectangles that
+ /// [`Self::damage_merged`] collapses into one. If the client supplied no explicit damage clips,
+ /// `f` is called once with the full plane rectangle. Coordinates are integer pixels in the
+ /// plane's source space.
+ ///
+ /// This lets a driver forward each changed region separately (e.g. to a remote display) instead
+ /// of the bounding box of them all.
+ ///
+ /// [`drm_atomic_helper_damage_iter`]: srctree/include/drm/drm_damage_helper.h
+ fn for_each_damage_clip(&self, old: &impl AsRawPlaneState, mut f: impl FnMut(Rect)) {
+ let mut iter = bindings::drm_atomic_helper_damage_iter::default();
+ let mut clip = bindings::drm_rect::default();
+ // SAFETY:
+ // - `old` and `self` are valid initialized `drm_plane_state`s via their type invariants.
+ // - `drm_atomic_helper_damage_iter_init` only reads the two states to set up `iter`, and
+ // `_next` only reads `iter` and writes `clip`; neither escapes a pointer.
+ unsafe {
+ bindings::drm_atomic_helper_damage_iter_init(
+ &mut iter,
+ core::ptr::from_ref(old.as_raw()),
+ core::ptr::from_ref(self.as_raw()),
+ );
+ while bindings::drm_atomic_helper_damage_iter_next(&mut iter, &mut clip) {
+ f(Rect::from_raw(&clip));
+ }
+ }
+ }
+
/// Return the framebuffer currently set for this plane state
#[inline]
fn framebuffer<D>(&self) -> Option<&Framebuffer<D>>
--
2.55.0
prev parent reply other threads:[~2026-07-03 3:02 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-17 15:02 [RFC PATCH 0/5] rust: drm: minimal KMS bindings, EDID read, rotation, HDCP defs Mike Lothian
2026-06-17 15:02 ` [RFC PATCH 1/4] rust: drm: add minimal KMS bindings for simple-display-pipe drivers Mike Lothian
2026-06-17 15:02 ` [RFC PATCH 2/4] rust: drm: expose drm_edid.h for reading connector EDID Mike Lothian
2026-06-17 15:02 ` [RFC PATCH 3/4] rust: drm: expose drm::Device::as_raw() Mike Lothian
2026-06-17 15:02 ` [RFC PATCH 4/4] rust: drm: expose drm_blend.h and the atomic new-CRTC-state accessor Mike Lothian
2026-06-17 15:11 ` [RFC PATCH 0/5] rust: drm: minimal KMS bindings, EDID read, rotation, HDCP defs Miguel Ojeda
2026-06-17 15:29 ` Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 00/18] rust: drm: safe KMS mode-object layer + evdi bindings Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 01/18] rust: drm: kms: forward-port the safe mode-object layer onto the typestate device Mike Lothian
2026-07-07 21:46 ` lyude
2026-07-07 22:21 ` lyude
2026-07-03 3:00 ` [RFC PATCH v2 02/18] rust: drm: kms: adapt the port to current drm-next Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 03/18] rust: drm: kms: break the Driver* trait well-formedness cycle Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 04/18] rust: drm: kms: build the kernel crate clean under -Znext-solver Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 05/18] rust: drm: expose <drm/display/drm_hdcp.h> HDCP 2.2 message definitions Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 06/18] rust: drm: kms: add a Framebuffer::vmap() guard Mike Lothian
2026-07-07 21:51 ` lyude
2026-07-03 3:00 ` [RFC PATCH v2 07/18] rust: drm: kms: add safe accessors for common state and connector modes Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 08/18] rust: drm: tyr: add the Kms associated type Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 09/18] rust: drm: add drm_event delivery Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 10/18] rust: drm: allow drivers to declare ioctls from their own uAPI module Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 11/18] rust: platform: add runtime platform device creation Mike Lothian
2026-07-03 3:00 ` [RFC PATCH v2 12/18] rust: drm: framebuffer: add geometry accessors, refcounting and a byte-slice vmap Mike Lothian
2026-07-03 3:01 ` [RFC PATCH v2 13/18] rust: i2c: add adapter-provider (bus controller) registration Mike Lothian
2026-07-03 3:01 ` [RFC PATCH v2 14/18] rust: add sysfs device attribute groups Mike Lothian
2026-07-03 3:01 ` [RFC PATCH v2 15/18] rust: drm: support hardware cursor planes with sleepable event delivery Mike Lothian
2026-07-03 3:01 ` [RFC PATCH v2 16/18] rust: drm: add CRTC gamma LUT and plane rotation property bindings Mike Lothian
2026-07-03 3:01 ` [RFC PATCH v2 17/18] rust: drm: kms: add connector detect() and mode_valid() hooks Mike Lothian
2026-07-03 3:01 ` Mike Lothian [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260703030123.2814-19-mike@fireburn.co.uk \
--to=mike@fireburn.co.uk \
--cc=a.hindborg@kernel.org \
--cc=airlied@gmail.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=lyude@redhat.com \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=tmgross@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox