egl/dri3: only set driver_name if not already set
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>
Tue, 15 Aug 2023 16:06:52 +0000 (12:06 -0400)
committerMarge Bot <emma+marge@anholt.net>
Thu, 31 Aug 2023 17:54:26 +0000 (17:54 +0000)
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24701>

src/egl/drivers/dri2/platform_x11_dri3.c

index 9f63697..af92a02 100644 (file)
@@ -627,7 +627,8 @@ dri3_x11_connect(struct dri2_egl_display *dri2_dpy)
    loader_get_user_preferred_fd(&dri2_dpy->fd_render_gpu,
                                 &dri2_dpy->fd_display_gpu);
 
-   dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd_render_gpu);
+   if (!dri2_dpy->driver_name)
+      dri2_dpy->driver_name = loader_get_driver_for_fd(dri2_dpy->fd_render_gpu);
    if (!dri2_dpy->driver_name) {
       _eglLog(_EGL_WARNING, "DRI3: No driver found");
       close(dri2_dpy->fd_render_gpu);