From b5b9548860414ffb2935a0e28e395c1c7505bb56 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Wed, 26 Jun 2024 14:39:03 -0700 Subject: [PATCH] WIP linux-drm-syncobj-v1 --- Cargo.lock | 10 +++++----- Cargo.toml | 3 ++- src/backend/kms/mod.rs | 28 +++++++++++++++++++++++++++- src/wayland/handlers/compositor.rs | 27 +++++++++++++++++++++++++++ src/wayland/handlers/drm_syncobj.rs | 19 +++++++++++++++++++ src/wayland/handlers/mod.rs | 1 + 6 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 src/wayland/handlers/drm_syncobj.rs diff --git a/Cargo.lock b/Cargo.lock index 089b7e3f..29091252 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1077,7 +1077,7 @@ version = "0.19.0" source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b8027d6d49f5bf3f36109" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.5", + "libloading 0.7.4", "winapi", ] @@ -1218,7 +1218,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.7.4", ] [[package]] @@ -2155,7 +2155,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.5", + "libloading 0.7.4", "thiserror", "widestring", "winapi", @@ -4697,7 +4697,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=08d31e1#08d31e17ea4ac47cddeb56e2ac18ee50b331911b" +source = "git+https://github.com/ids1024/smithay?branch=drm-syncobj#d6cd7cab0f3e89f1cb0e60d5d10bf6a51a9ee44e" dependencies = [ "appendlist", "ash 0.38.0+1.3.281", @@ -5949,7 +5949,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.5", + "libloading 0.7.4", "log", "metal", "naga", diff --git a/Cargo.toml b/Cargo.toml index bb623462..95056e24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,4 +116,5 @@ inherits = "release" lto = "fat" [patch."https://github.com/Smithay/smithay.git"] -smithay = { git = "https://github.com/smithay//smithay", rev = "08d31e1" } +# smithay = { git = "https://github.com/smithay//smithay", rev = "08d31e1" } +smithay = { git = "https://github.com/ids1024/smithay", branch = "drm-syncobj" } diff --git a/src/backend/kms/mod.rs b/src/backend/kms/mod.rs index 279cacb7..66d57982 100644 --- a/src/backend/kms/mod.rs +++ b/src/backend/kms/mod.rs @@ -27,7 +27,11 @@ use smithay::{ wayland_server::{Client, DisplayHandle}, }, utils::{DevPath, Size}, - wayland::{dmabuf::DmabufGlobal, relative_pointer::RelativePointerManagerState}, + wayland::{ + dmabuf::DmabufGlobal, + drm_syncobj::{supports_syncobj_eventfd, DrmSyncobjState}, + relative_pointer::RelativePointerManagerState, + }, }; use tracing::{error, info, trace, warn}; @@ -60,6 +64,8 @@ pub struct KmsState { session: LibSeatSession, libinput: Libinput, + + pub syncobj_state: Option, } pub fn init_backend( @@ -126,6 +132,8 @@ pub fn init_backend( session, libinput: libinput_context, + + syncobj_state: None, }); // start x11 @@ -138,6 +146,24 @@ pub fn init_backend( } } + // TODO check if main device supports syncobj eventfd? + let kms = match &mut state.backend { + BackendData::Kms(kms) => kms, + _ => unreachable!(), + }; + if let Some(primary_node) = kms + .primary_node + .and_then(|node| node.node_with_type(NodeType::Primary).and_then(|x| x.ok())) + { + if let Some(device) = kms.drm_devices.get(&primary_node) { + let import_device = device.drm.device_fd().clone(); + if supports_syncobj_eventfd(&import_device) { + let syncobj_state = DrmSyncobjState::new::(&dh, import_device); + kms.syncobj_state = Some(syncobj_state); + } + } + } + Ok(()) } diff --git a/src/wayland/handlers/compositor.rs b/src/wayland/handlers/compositor.rs index a71fbb9d..a491bd18 100644 --- a/src/wayland/handlers/compositor.rs +++ b/src/wayland/handlers/compositor.rs @@ -14,6 +14,7 @@ use smithay::{ CompositorHandler, CompositorState, SurfaceAttributes, }, dmabuf::get_dmabuf, + drm_syncobj::DrmSyncobjCachedState, seat::WaylandFocus, shell::{ wlr_layer::LayerSurfaceAttributes, @@ -100,7 +101,14 @@ impl CompositorHandler for State { fn new_surface(&mut self, surface: &WlSurface) { add_pre_commit_hook::(surface, move |state, _dh, surface| { + let mut acquire_point = None; let maybe_dmabuf = with_states(surface, |surface_data| { + acquire_point = surface_data + .cached_state + .get::() + .pending() + .acquire_point + .clone(); surface_data .cached_state .get::() @@ -113,6 +121,25 @@ impl CompositorHandler for State { }) }); if let Some(dmabuf) = maybe_dmabuf { + if let Some(acquire_point) = acquire_point { + if let Ok((blocker, source)) = acquire_point.generate_blocker() { + let client = surface.client().unwrap(); + let res = state.common.event_loop_handle.insert_source( + source, + move |_, _, state| { + let dh = state.common.display_handle.clone(); + state + .client_compositor_state(&client) + .blocker_cleared(state, &dh); + Ok(()) + }, + ); + if res.is_ok() { + add_blocker(surface, blocker); + return; + } + } + } if let Ok((blocker, source)) = dmabuf.generate_blocker(Interest::READ) { let client = surface.client().unwrap(); let res = diff --git a/src/wayland/handlers/drm_syncobj.rs b/src/wayland/handlers/drm_syncobj.rs new file mode 100644 index 00000000..50939c12 --- /dev/null +++ b/src/wayland/handlers/drm_syncobj.rs @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-3.0-only + +use crate::state::{BackendData, State}; +use smithay::{ + delegate_drm_syncobj, + wayland::drm_syncobj::{DrmSyncobjHandler, DrmSyncobjState}, +}; + +impl DrmSyncobjHandler for State { + fn drm_syncobj_state(&mut self) -> &mut DrmSyncobjState { + let kms = match &mut self.backend { + BackendData::Kms(kms) => kms, + _ => unreachable!(), + }; + kms.syncobj_state.as_mut().unwrap() + } +} + +delegate_drm_syncobj!(State); diff --git a/src/wayland/handlers/mod.rs b/src/wayland/handlers/mod.rs index 82415aa4..a10ea5b7 100644 --- a/src/wayland/handlers/mod.rs +++ b/src/wayland/handlers/mod.rs @@ -9,6 +9,7 @@ pub mod decoration; pub mod dmabuf; pub mod drm; pub mod drm_lease; +pub mod drm_syncobj; pub mod foreign_toplevel_list; pub mod fractional_scale; pub mod idle_inhibit;