From f431bc230097b64a42d18344245f177803bf8ea8 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <idscott@system76.com>
Date: Mon, 11 Mar 2024 12:31:27 -0700
Subject: [PATCH] Add sync points to double buffered surface state

---
 src/wayland/drm_syncobj/mod.rs | 50 ++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/wayland/drm_syncobj/mod.rs b/src/wayland/drm_syncobj/mod.rs
index 6191afd17133..40e36e975094 100644
--- a/src/wayland/drm_syncobj/mod.rs
+++ b/src/wayland/drm_syncobj/mod.rs
@@ -8,6 +8,34 @@ use wayland_server::{
     protocol::wl_surface::WlSurface, Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
 };
 
+use super::compositor::{with_states, Cacheable};
+
+#[derive(Clone)]
+struct SyncPoint {
+    fd: Arc<OwnedFd>,
+    point: u64,
+}
+
+#[derive(Default)]
+struct DrmSyncobjCachedState {
+    acquire_point: Option<SyncPoint>,
+    release_point: Option<SyncPoint>,
+}
+
+impl Cacheable for DrmSyncobjCachedState {
+    fn commit(&mut self, _dh: &DisplayHandle) -> Self {
+        Self {
+            acquire_point: self.acquire_point.clone(),
+            release_point: self.release_point.clone(),
+        }
+    }
+
+    fn merge_into(self, into: &mut Self, _dh: &DisplayHandle) {
+        into.acquire_point = self.acquire_point;
+        into.release_point = self.release_point;
+    }
+}
+
 pub struct DrmSyncobjState {}
 
 impl DrmSyncobjState {
@@ -67,7 +95,7 @@ impl<D> Dispatch<WpLinuxDrmSyncobjSurfaceV1, DrmSyncobjSurfaceData, D> for DrmSy
         _client: &Client,
         _resource: &WpLinuxDrmSyncobjSurfaceV1,
         request: wp_linux_drm_syncobj_surface_v1::Request,
-        _data: &DrmSyncobjSurfaceData,
+        data: &DrmSyncobjSurfaceData,
         _dh: &DisplayHandle,
         data_init: &mut DataInit<'_, D>,
     ) {
@@ -78,16 +106,28 @@ impl<D> Dispatch<WpLinuxDrmSyncobjSurfaceV1, DrmSyncobjSurfaceData, D> for DrmSy
                 point_hi,
                 point_lo,
             } => {
-                let fd = &timeline.data::<DrmSyncobjTimelineData>().unwrap().fd;
-                let point = ((point_hi as u64) << 32) + (point_lo as u64);
+                let sync_point = SyncPoint {
+                    fd: timeline.data::<DrmSyncobjTimelineData>().unwrap().fd.clone(),
+                    point: ((point_hi as u64) << 32) + (point_lo as u64),
+                };
+                with_states(&data.surface, |states| {
+                    let mut cached_state = states.cached_state.pending::<DrmSyncobjCachedState>();
+                    cached_state.acquire_point = Some(sync_point);
+                });
             }
             wp_linux_drm_syncobj_surface_v1::Request::SetReleasePoint {
                 timeline,
                 point_hi,
                 point_lo,
             } => {
-                let fd = &timeline.data::<DrmSyncobjTimelineData>().unwrap().fd;
-                let point = ((point_hi as u64) << 32) + (point_lo as u64);
+                let sync_point = SyncPoint {
+                    fd: timeline.data::<DrmSyncobjTimelineData>().unwrap().fd.clone(),
+                    point: ((point_hi as u64) << 32) + (point_lo as u64),
+                };
+                with_states(&data.surface, |states| {
+                    let mut cached_state = states.cached_state.pending::<DrmSyncobjCachedState>();
+                    cached_state.release_point = Some(sync_point);
+                });
             }
             _ => unreachable!(),
         }