From c8c46bf90066748d550f492abf6fc03136cde348 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 9 Aug 2024 07:40:52 -0400 Subject: [PATCH] egl: fix fd passing on init with zink this should be passed with gbm but not for any other display type Fixes: 5ab29555cf0 ("egl/x11: pass render fd to screen create for zink") Acked-by: Daniel Stone Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 85d978ca2bd..9059edac6c4 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -807,7 +807,13 @@ dri2_create_screen(_EGLDisplay *disp) } } - int screen_fd = dri2_dpy->swrast ? -1 : dri2_dpy->fd_render_gpu; + int screen_fd = -1; + if (!dri2_dpy->swrast) { +#ifdef HAVE_DRM_PLATFORM + if (!dri2_dpy->kopper || dri2_dpy->gbm_dri) +#endif + screen_fd = dri2_dpy->fd_render_gpu; + } dri2_dpy->dri_screen_render_gpu = driCreateNewScreen3( 0, screen_fd, dri2_dpy->loader_extensions, type, &dri2_dpy->driver_configs, false, disp);