WIP linux-drm-syncobj-v1

ids1024 · ids1024 · commit d026857a32e0 · 2024-04-09T14:17:17.000-07:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -69,6 +69,27 @@ profiling = "1.0"
 smallvec = "1.11"
 pixman = { version = "0.1.0", features = ["drm-fourcc"], optional = true }
 
+[patch.crates-io]
+wayland-egl = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-protocols = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-protocols-wlr = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-protocols-misc = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-server = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-client = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-sys = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-backend = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+wayland-scanner = { git = "https://github.com/ids1024/wayland-rs", branch = "wayland-protocols-1.34" }
+# wayland-egl = { path = "../wayland-rs/wayland-egl/" }
+# wayland-protocols = { path = "../wayland-rs/wayland-protocols/" }
+# wayland-protocols-wlr = { path = "../wayland-rs/wayland-protocols-wlr/" }
+# wayland-protocols-misc = { path = "../wayland-rs/wayland-protocols-misc/" }
+# wayland-server = { path = "../wayland-rs/wayland-server/" }
+# wayland-client = { path = "../wayland-rs/wayland-client/" }
+# wayland-sys = { path = "../wayland-rs/wayland-sys/" }
+# wayland-backend = { path = "../wayland-rs/wayland-backend/" }
+# wayland-scanner = { path = "../wayland-rs/wayland-scanner/" }
+drm = { git = "https://github.com/smithay/drm-rs" }
+drm-ffi = { git = "https://github.com/smithay/drm-rs" }
 
 [dev-dependencies]
 clap = { version = "4", features = ["derive"] }
diff --git a/anvil/src/shell/mod.rs b/anvil/src/shell/mod.rs
@@ -25,6 +25,7 @@ use smithay::{
             CompositorState, SurfaceAttributes, TraversalAction,
         },
         dmabuf::get_dmabuf,
+        drm_syncobj::{DrmSyncobjCachedState, DrmSyncobjHandler},
         shell::{
             wlr_layer::{
                 Layer, LayerSurface as WlrLayerSurface, LayerSurfaceData, WlrLayerShellHandler,
@@ -107,7 +108,13 @@ impl<BackendData: Backend> CompositorHandler for AnvilState<BackendData> {
 
     fn new_surface(&mut self, surface: &WlSurface) {
         add_pre_commit_hook::<Self, _>(surface, move |state, _dh, surface| {
+            let mut acquire_point = None;
             let maybe_dmabuf = with_states(surface, |surface_data| {
+                acquire_point = surface_data
+                    .cached_state
+                    .pending::<DrmSyncobjCachedState>()
+                    .acquire_point
+                    .clone();
                 surface_data
                     .cached_state
                     .pending::<SurfaceAttributes>()
@@ -119,6 +126,20 @@ impl<BackendData: Backend> CompositorHandler for AnvilState<BackendData> {
                     })
             });
             if let Some(dmabuf) = maybe_dmabuf {
+                if let Some(acquire_point) = acquire_point {
+                    if let Ok((blocker, source)) = acquire_point.generate_blocker(state.import_device()) {
+                        let client = surface.client().unwrap();
+                        let res = state.handle.insert_source(source, move |_, _, data| {
+                            let dh = data.display_handle.clone();
+                            data.client_compositor_state(&client).blocker_cleared(data, &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 = state.handle.insert_source(source, move |_, _, data| {
diff --git a/anvil/src/state.rs b/anvil/src/state.rs
@@ -13,12 +13,13 @@ use smithay::{
             default_primary_scanout_output_compare, utils::select_dmabuf_feedback, RenderElementStates,
         },
     },
-    delegate_compositor, delegate_data_control, delegate_data_device, delegate_fractional_scale,
-    delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit, delegate_layer_shell,
-    delegate_output, delegate_pointer_constraints, delegate_pointer_gestures, delegate_presentation,
-    delegate_primary_selection, delegate_relative_pointer, delegate_seat, delegate_security_context,
-    delegate_shm, delegate_tablet_manager, delegate_text_input_manager, delegate_viewporter,
-    delegate_virtual_keyboard_manager, delegate_xdg_activation, delegate_xdg_decoration, delegate_xdg_shell,
+    delegate_compositor, delegate_data_control, delegate_data_device, delegate_drm_syncobj,
+    delegate_fractional_scale, delegate_input_method_manager, delegate_keyboard_shortcuts_inhibit,
+    delegate_layer_shell, delegate_output, delegate_pointer_constraints, delegate_pointer_gestures,
+    delegate_presentation, delegate_primary_selection, delegate_relative_pointer, delegate_seat,
+    delegate_security_context, delegate_shm, delegate_tablet_manager, delegate_text_input_manager,
+    delegate_viewporter, delegate_virtual_keyboard_manager, delegate_xdg_activation, delegate_xdg_decoration,
+    delegate_xdg_shell,
     desktop::{
         space::SpaceElement,
         utils::{
@@ -48,6 +49,7 @@ use smithay::{
     wayland::{
         compositor::{get_parent, with_states, CompositorClientState, CompositorState},
         dmabuf::DmabufFeedback,
+        drm_syncobj::{DrmSyncobjHandler, DrmSyncobjState},
         fractional_scale::{with_fractional_scale, FractionalScaleHandler, FractionalScaleManagerState},
         input_method::{InputMethodHandler, InputMethodManagerState, PopupSurface},
         keyboard_shortcuts_inhibit::{
@@ -526,6 +528,24 @@ impl<BackendData: Backend> XdgForeignHandler for AnvilState<BackendData> {
 }
 smithay::delegate_xdg_foreign!(@<BackendData: Backend + 'static> AnvilState<BackendData>);
 
+impl<BackendData: Backend> DrmSyncobjHandler for AnvilState<BackendData> {
+    fn import_device(&self) -> &smithay::backend::drm::DrmDeviceFd {
+        use std::any::Any;
+        // XXX
+        let udev_data = &<dyn Any>::downcast_ref::<AnvilState<crate::udev::UdevData>>(self)
+            .unwrap()
+            .backend_data;
+        udev_data.backends[&udev_data
+            .primary_gpu
+            .node_with_type(smithay::backend::drm::NodeType::Primary)
+            .unwrap()
+            .unwrap()]
+            .drm
+            .device_fd()
+    }
+}
+delegate_drm_syncobj!(@<BackendData: Backend + 'static> AnvilState<BackendData>);
+
 impl<BackendData: Backend + 'static> AnvilState<BackendData> {
     pub fn init(
         display: Display<AnvilState<BackendData>>,
@@ -604,6 +624,7 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {
                 .get_data::<ClientState>()
                 .map_or(true, |client_state| client_state.security_context.is_none())
         });
+        DrmSyncobjState::new::<Self>(&dh);
 
         // init input
         let seat_name = backend_data.seat_name();
diff --git a/anvil/src/udev.rs b/anvil/src/udev.rs
@@ -125,9 +125,9 @@ pub struct UdevData {
     pub session: LibSeatSession,
     dh: DisplayHandle,
     dmabuf_state: Option<(DmabufState, DmabufGlobal)>,
-    primary_gpu: DrmNode,
+    pub primary_gpu: DrmNode,
     gpus: GpuManager<GbmGlesBackend<GlesRenderer, DrmDeviceFd>>,
-    backends: HashMap<DrmNode, BackendData>,
+    pub backends: HashMap<DrmNode, BackendData>,
     pointer_images: Vec<(xcursor::parser::Image, MemoryRenderBuffer)>,
     pointer_element: PointerElement,
     #[cfg(feature = "debug")]
@@ -737,13 +737,13 @@ impl Drop for SurfaceData {
     }
 }
 
-struct BackendData {
+pub struct BackendData {
     surfaces: HashMap<crtc::Handle, SurfaceData>,
     non_desktop_connectors: Vec<(connector::Handle, crtc::Handle)>,
     leasing_global: Option<DrmLeaseState>,
     active_leases: Vec<DrmLease>,
     gbm: GbmDevice<DrmDeviceFd>,
-    drm: DrmDevice,
+    pub drm: DrmDevice,
     drm_scanner: DrmScanner,
     render_node: DrmNode,
     registration_token: RegistrationToken,
diff --git a/src/wayland/compositor/handlers.rs b/src/wayland/compositor/handlers.rs
@@ -133,6 +133,7 @@ impl Cacheable for SurfaceAttributes {
 
                 if Some(&buffer) != new_buffer {
                     buffer.release();
+                    // TODO explicit sync?
                 }
             }
         }
diff --git a/src/wayland/compositor/tree.rs b/src/wayland/compositor/tree.rs
@@ -138,6 +138,7 @@ impl PrivateSurfaceData {
             let mut child_guard = child_mutex.lock().unwrap();
             child_guard.parent = None;
         }
+        // TODO explicit sync?
         if let Some(BufferAssignment::NewBuffer(buffer)) = my_data
             .public_data
             .cached_state
diff --git a/src/wayland/drm_syncobj/mod.rs b/src/wayland/drm_syncobj/mod.rs
diff --git a/src/wayland/drm_syncobj/sync_point.rs b/src/wayland/drm_syncobj/sync_point.rs
diff --git a/src/wayland/mod.rs b/src/wayland/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ impl Cacheable for SurfaceAttributes {`
`133`	`133`
`134`	`134`	`if Some(&buffer) != new_buffer {`
`135`	`135`	`buffer.release();`
	`136`	`+ // TODO explicit sync?`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ impl PrivateSurfaceData {`
`138`	`138`	`let mut child_guard = child_mutex.lock().unwrap();`
`139`	`139`	`child_guard.parent = None;`
`140`	`140`	`}`
	`141`	`+ // TODO explicit sync?`
`141`	`142`	`if let Some(BufferAssignment::NewBuffer(buffer)) = my_data`
`142`	`143`	`.public_data`
`143`	`144`	`.cached_state`