From f5db4839730643169b7e8b7fb6ae2fbb8743ebe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edgars=20C=C4=ABrulis?= <edgarsciruliss@gmail.com>
Date: Sat, 12 Oct 2024 03:12:07 +0300
Subject: [PATCH] drm-timeline: Add check for conflicting acquire and release
 points (#8083)

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
---
 src/protocols/DRMSyncobj.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/protocols/DRMSyncobj.cpp b/src/protocols/DRMSyncobj.cpp
index 4993f1a4..a7f242ee 100644
--- a/src/protocols/DRMSyncobj.cpp
+++ b/src/protocols/DRMSyncobj.cpp
@@ -55,8 +55,13 @@ CDRMSyncobjSurfaceResource::CDRMSyncobjSurfaceResource(SP<CWpLinuxDrmSyncobjSurf
             return;
         }
 
-        if (!pending.acquireTimeline)
-            return;
+        if (pending.acquireTimeline && pending.releaseTimeline && pending.acquireTimeline == pending.releaseTimeline) {
+            if (pending.acquirePoint >= pending.releasePoint) {
+                resource->error(WP_LINUX_DRM_SYNCOBJ_SURFACE_V1_ERROR_CONFLICTING_POINTS, "Acquire and release points are on the same timeline, and acquire >= release");
+                surface->pending.rejected = true;
+                return;
+            }
+        }
 
         // wait for the acquire timeline to materialize
         auto materialized = pending.acquireTimeline->timeline->check(pending.acquirePoint, DRM_SYNCOBJ_WAIT_FLAGS_WAIT_AVAILABLE);