kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

drm: add ObjectChangeValue

Browse source
This commit is contained in:
Julian Orth 2025-07-10 11:10:07 +02:00
parent b8d4eeb8e4
commit e95e764b46
4 changed files with 55 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backends/metal.rs
View file

@ -252,7 +252,7 @@ impl Backend for MetalBackend {
{ {
crtc.active.value.set(!idle); crtc.active.value.set(!idle);
change.change_object(crtc.id, |c| { change.change_object(crtc.id, |c| {
c.change(crtc.active.id, (!idle) as _); c.change(crtc.active.id, !idle);
}); });
} }
} }

18
src/backends/metal/present.rs
View file

@ -335,7 +335,7 @@ impl MetalConnector {
macro_rules! change { macro_rules! change {
($c:expr, $prop:expr, $new:expr) => {{ ($c:expr, $prop:expr, $new:expr) => {{
if $prop.value.get() != $new { if $prop.value.get() != $new {
$c.change($prop.id, $new as u64); $c.change($prop.id, $new);
try_async_flip = false; try_async_flip = false;
$prop.pending_value.set(Some($new)); $prop.pending_value.set(Some($new));
} }
@ -362,7 +362,7 @@ impl MetalConnector {
} }
}; };
changes.change_object(plane.id, |c| { changes.change_object(plane.id, |c| {
c.change(plane.fb_id, fb.fb.id().0 as _); c.change(plane.fb_id, fb.fb.id());
change!(c, plane.src_w, (src_width as u32) << 16); change!(c, plane.src_w, (src_width as u32) << 16);
change!(c, plane.src_h, (src_height as u32) << 16); change!(c, plane.src_h, (src_height as u32) << 16);
change!(c, plane.crtc_x, crtc_x); change!(c, plane.crtc_x, crtc_x);
@ -383,7 +383,7 @@ impl MetalConnector {
&& let Some(fb) = &*self.active_framebuffer.borrow() && let Some(fb) = &*self.active_framebuffer.borrow()
{ {
changes.change_object(plane.id, |c| { changes.change_object(plane.id, |c| {
c.change(plane.fb_id, fb.fb.id().0 as _); c.change(plane.fb_id, fb.fb.id());
}); });
} }
} }
@ -400,12 +400,12 @@ impl MetalConnector {
.. ..
} => { } => {
changes.change_object(plane.id, |c| { changes.change_object(plane.id, |c| {
c.change(plane.fb_id, fb.id().0 as _); c.change(plane.fb_id, fb.id());
c.change(plane.crtc_id.id, crtc.id.0 as _); c.change(plane.crtc_id.id, crtc.id);
c.change(plane.crtc_x.id, *x as _); c.change(plane.crtc_x.id, *x);
c.change(plane.crtc_y.id, *y as _); c.change(plane.crtc_y.id, *y);
c.change(plane.crtc_w.id, *width as _); c.change(plane.crtc_w.id, *width);
c.change(plane.crtc_h.id, *height as _); c.change(plane.crtc_h.id, *height);
c.change(plane.src_x.id, 0); c.change(plane.src_x.id, 0);
c.change(plane.src_y.id, 0); c.change(plane.src_y.id, 0);
c.change(plane.src_w.id, (*width as u64) << 16); c.change(plane.src_w.id, (*width as u64) << 16);

26
src/backends/metal/video.rs
View file

@ -956,7 +956,7 @@ impl Connector for MetalConnector {
}; };
let mut change = self.master.change(); let mut change = self.master.change();
change.change_object(crtc.id, |c| { change.change_object(crtc.id, |c| {
c.change(crtc.vrr_enabled.id, new_enabled as _); c.change(crtc.vrr_enabled.id, new_enabled);
}); });
if let Err(e) = change.commit(0, 0) { if let Err(e) = change.commit(0, 0) {
log::error!("Could not change vrr mode: {}", ErrorFmt(e)); log::error!("Could not change vrr mode: {}", ErrorFmt(e));
@ -2389,8 +2389,8 @@ impl MetalBackend {
changes.change_object(plane.id, |c| { changes.change_object(plane.id, |c| {
c.change(plane.crtc_id.id, 0); c.change(plane.crtc_id.id, 0);
c.change(plane.fb_id, 0); c.change(plane.fb_id, 0);
c.change(plane.in_fence_fd, -1i32 as u64); c.change(plane.in_fence_fd, -1i32);
}) });
} }
} }
@ -2441,7 +2441,7 @@ impl MetalBackend {
c.change(crtc.active.id, 0); c.change(crtc.active.id, 0);
c.change(crtc.mode_id.id, 0); c.change(crtc.mode_id.id, 0);
c.change(crtc.vrr_enabled.id, 0); c.change(crtc.vrr_enabled.id, 0);
}) });
} }
} }
@ -2832,7 +2832,7 @@ impl MetalBackend {
} }
let vrr_requested = vrr_crtcs.contains(&crtc.id); let vrr_requested = vrr_crtcs.contains(&crtc.id);
if crtc.vrr_enabled.value.get() != vrr_requested { if crtc.vrr_enabled.value.get() != vrr_requested {
c.change(crtc.vrr_enabled.id, vrr_requested as _); c.change(crtc.vrr_enabled.id, vrr_requested);
crtc.vrr_enabled.value.set(vrr_requested); crtc.vrr_enabled.value.set(vrr_requested);
} }
}); });
@ -3077,9 +3077,9 @@ impl MetalBackend {
let hdr_blob_id = hdr_blob.as_ref().map(|b| b.id()).unwrap_or_default(); let hdr_blob_id = hdr_blob.as_ref().map(|b| b.id()).unwrap_or_default();
let mode_blob = mode.create_blob(&connector.master)?; let mode_blob = mode.create_blob(&connector.master)?;
changes.change_object(connector.id, |c| { changes.change_object(connector.id, |c| {
c.change(dd.crtc_id.id, crtc.id.0 as _); c.change(dd.crtc_id.id, crtc.id);
if let Some(meta) = &dd.hdr_metadata { if let Some(meta) = &dd.hdr_metadata {
c.change(meta.id, hdr_blob_id.0 as _); c.change(meta.id, hdr_blob_id);
} }
if let Some(cs) = &dd.colorspace { if let Some(cs) = &dd.colorspace {
c.change(cs.id, dd.persistent.color_space.get().to_drm()); c.change(cs.id, dd.persistent.color_space.get().to_drm());
@ -3087,8 +3087,8 @@ impl MetalBackend {
}); });
changes.change_object(crtc.id, |c| { changes.change_object(crtc.id, |c| {
c.change(crtc.active.id, 1); c.change(crtc.active.id, 1);
c.change(crtc.mode_id.id, mode_blob.id().0 as _); c.change(crtc.mode_id.id, mode_blob.id());
c.change(crtc.vrr_enabled.id, dd.should_enable_vrr() as _); c.change(crtc.vrr_enabled.id, dd.should_enable_vrr());
}); });
connector.crtc.set(Some(crtc.clone())); connector.crtc.set(Some(crtc.clone()));
connector.version.fetch_add(1); connector.version.fetch_add(1);
@ -3212,12 +3212,12 @@ impl MetalBackend {
} }
} }
changes.change_object(primary_plane.id, |c| { changes.change_object(primary_plane.id, |c| {
c.change(primary_plane.fb_id, buffers[0].drm.id().0 as _); c.change(primary_plane.fb_id, buffers[0].drm.id());
c.change(primary_plane.crtc_id.id, crtc.id.0 as _); c.change(primary_plane.crtc_id.id, crtc.id);
c.change(primary_plane.crtc_x.id, 0); c.change(primary_plane.crtc_x.id, 0);
c.change(primary_plane.crtc_y.id, 0); c.change(primary_plane.crtc_y.id, 0);
c.change(primary_plane.crtc_w.id, mode.hdisplay as _); c.change(primary_plane.crtc_w.id, mode.hdisplay);
c.change(primary_plane.crtc_h.id, mode.vdisplay as _); c.change(primary_plane.crtc_h.id, mode.vdisplay);
c.change(primary_plane.src_x.id, 0); c.change(primary_plane.src_x.id, 0);
c.change(primary_plane.src_y.id, 0); c.change(primary_plane.src_y.id, 0);
c.change(primary_plane.src_w.id, (mode.hdisplay as u64) << 16); c.change(primary_plane.src_w.id, (mode.hdisplay as u64) << 16);

34
src/video/drm.rs
View file

@ -1052,9 +1052,9 @@ impl Change {
} }
impl<'a> ObjectChange<'a> { impl<'a> ObjectChange<'a> {
pub fn change(&mut self, property_id: DrmProperty, value: u64) { pub fn change(&mut self, property_id: DrmProperty, value: impl ObjectChangeValue) {
self.change.props.push(property_id.0); self.change.props.push(property_id.0);
self.change.values.push(value); self.change.values.push(value.into_u64());
} }
} }
@ -1069,6 +1069,36 @@ impl Drop for Change {
} }
} }
pub trait ObjectChangeValue {
fn into_u64(self) -> u64;
}
macro_rules! num {
($ty:ty) => {
impl ObjectChangeValue for $ty {
fn into_u64(self) -> u64 {
self as u64
}
}
};
}
num!(u16);
num!(i32);
num!(u32);
num!(i64);
num!(u64);
num!(bool);
impl<T> ObjectChangeValue for T
where
T: DrmObject,
{
fn into_u64(self) -> u64 {
self.id() as u64
}
}
#[expect(non_camel_case_types)] #[expect(non_camel_case_types)]
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub enum ConnectorType { pub enum ConnectorType {