frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland/glamor/gbm: Don't close fence_fd after xwl_glamor_wait_fence 

eglCreateSyncKHR takes ownership of the file descriptor. Noticed by
inspection.

While we're at it, move the fence_fd declaration to the scope where
it's used.

Last but not least, close the fd in xwl_glamor_wait_fence when bailing
before calling eglCreateSyncKHR, and document that it takes ownership.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1712>
This commit is contained in:
Michel Dänzer 2024-10-03 12:33:56 +02:00 committed by Marge Bot
parent b306df5a60
commit 91b5a003a5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -1516,16 +1516,15 @@ xwl_glamor_gbm_wait_syncpts(PixmapPtr pixmap)
#ifdef DRI3 #ifdef DRI3
struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen); struct xwl_screen *xwl_screen = xwl_screen_get(pixmap->drawable.pScreen);
struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap); struct xwl_pixmap *xwl_pixmap = xwl_pixmap_get(pixmap);
int fence_fd;
if (!xwl_screen->glamor || !xwl_pixmap) if (!xwl_screen->glamor || !xwl_pixmap)
return; return;
if (xwl_pixmap->syncobj) { if (xwl_pixmap->syncobj) {
fence_fd = xwl_pixmap->syncobj->export_fence(xwl_pixmap->syncobj, int fence_fd = xwl_pixmap->syncobj->export_fence(xwl_pixmap->syncobj,
xwl_pixmap->timeline_point); xwl_pixmap->timeline_point);
xwl_glamor_wait_fence(xwl_screen, fence_fd); xwl_glamor_wait_fence(xwl_screen, fence_fd);
close(fence_fd);
} }
#endif /* DRI3 */ #endif /* DRI3 */
} }

5
hw/xwayland/xwayland-glamor.c
View File

@ -198,14 +198,17 @@ xwl_glamor_get_fence(struct xwl_screen *xwl_screen)
return fence_fd; return fence_fd;
} }
/* Takes ownership of fence_fd, specifically eglCreateSyncKHR does */
void void
xwl_glamor_wait_fence(struct xwl_screen *xwl_screen, int fence_fd) xwl_glamor_wait_fence(struct xwl_screen *xwl_screen, int fence_fd)
{ {
EGLint attribs[3]; EGLint attribs[3];
EGLSyncKHR sync; EGLSyncKHR sync;
if (!xwl_screen->glamor) if (!xwl_screen->glamor) {
close(fence_fd);
return; return;
}
xwl_glamor_egl_make_current(xwl_screen); xwl_glamor_egl_make_current(xwl_screen);