linux/clgl: Wait for fence during sync

We need to wait for sync to actually be done Signed-off-by: Sylvain Munaut <[email protected]>
intel · Jan 25, 2024 · fccda05 · fccda05
1 parent b4364cb
commit fccda05
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp b/opencl/source/sharings/gl/linux/gl_buffer_linux.cpp
@@ -20,6 +20,9 @@
 
 #include "config.h"
 
+#include <poll.h>
+#include <unistd.h>
+
 using namespace NEO;
 
 Buffer *GlBuffer::createSharedGlBuffer(Context *context, cl_mem_flags flags, unsigned int bufferId, cl_int *errcodeRet) {
@@ -102,18 +105,33 @@ void GlBuffer::synchronizeObject(UpdateData &updateData) {
 
     /* Prepare flush request */
     struct mesa_glinterop_export_in objIn = {};
+    struct mesa_glinterop_flush_out syncOut = {};
+    int fenceFd = -1;
 
     objIn.version = 2;
     objIn.target = GL_ARRAY_BUFFER;
     objIn.obj = this->clGlObjectId;
 
+    syncOut.version = 1;
+    syncOut.fence_fd = &fenceFd;
+
     /* Call MESA interop */
-    int retValue = sharingFunctions->flushObjects(1, &objIn, nullptr);
+    int retValue = sharingFunctions->flushObjects(1, &objIn, &syncOut);
     if (retValue != MESA_GLINTEROP_SUCCESS) {
         updateData.synchronizationStatus = SynchronizeStatus::SYNCHRONIZE_ERROR;
         return;
     }
 
+    /* Wait on the fence fd */
+    struct pollfd fp = {
+        .fd = fenceFd,
+        .events = POLLIN,
+        .revents = 0,
+    };
+    poll(&fp, 1, 1000);
+    close(fenceFd);
+
+    /* Done */
     updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
 }
 

diff --git a/opencl/source/sharings/gl/linux/gl_texture_linux.cpp b/opencl/source/sharings/gl/linux/gl_texture_linux.cpp
@@ -29,6 +29,9 @@
 #include "config.h"
 #include <GL/gl.h>
 
+#include <poll.h>
+#include <unistd.h>
+
 namespace NEO {
 Image *GlTexture::createSharedGlTexture(Context *context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture,
                                         cl_int *errcodeRet) {
@@ -219,19 +222,34 @@ void GlTexture::synchronizeObject(UpdateData &updateData) {
 
     /* Prepare flush request */
     struct mesa_glinterop_export_in texIn = {};
+    struct mesa_glinterop_flush_out syncOut = {};
+    int fenceFd = -1;
 
     texIn.version = 2;
     texIn.target = this->target;
     texIn.obj = this->clGlObjectId;
     texIn.miplevel = this->miplevel;
 
+    syncOut.version = 1;
+    syncOut.fence_fd = &fenceFd;
+
     /* Call MESA interop */
-    int retValue = sharingFunctions->flushObjects(1, &texIn, nullptr);
+    int retValue = sharingFunctions->flushObjects(1, &texIn, &syncOut);
     if (retValue != MESA_GLINTEROP_SUCCESS) {
         updateData.synchronizationStatus = SynchronizeStatus::SYNCHRONIZE_ERROR;
         return;
     }
 
+    /* Wait on the fence fd */
+    struct pollfd fp = {
+        .fd = fenceFd,
+        .events = POLLIN,
+        .revents = 0,
+    };
+    poll(&fp, 1, 1000);
+    close(fenceFd);
+
+    /* Done */
     updateData.synchronizationStatus = SynchronizeStatus::ACQUIRE_SUCCESFUL;
 }