From 63191107ab4b1e20b0fcd66b706c639259eb009f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 18 Jul 2024 15:55:53 -0400
Subject: [PATCH] loader/dri3: avoid killing the xcb connection if dri3 not
 found

calling open if the extension is unsupported closes the connection

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30128>
---
 src/loader/loader_dri3_helper.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
index 671dbba5be1..2d032e8bc4c 100644
--- a/src/loader/loader_dri3_helper.c
+++ b/src/loader/loader_dri3_helper.c
@@ -1290,6 +1290,12 @@ loader_dri3_open(xcb_connection_t *conn,
    xcb_xfixes_query_version_cookie_t fixes_cookie;
    xcb_xfixes_query_version_reply_t *fixes_reply;
    int                          fd;
+   const xcb_query_extension_reply_t *extension;
+
+   xcb_prefetch_extension_data(conn, &xcb_dri3_id);
+   extension = xcb_get_extension_data(conn, &xcb_dri3_id);
+   if (!(extension && extension->present))
+      return -1;
 
    cookie = xcb_dri3_open(conn,
                           root,