From 439c0ee5e4656296b79c8bb225ef0476c995c2c2 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 12 Mar 2024 11:36:41 +0100
Subject: [PATCH] xwayland/glamor: Drop the get_main_device() hook

Call xwl_gbm_get_main_device() directly from xwl_screen_get_main_dev().

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
---
 hw/xwayland/xwayland-dmabuf.c     | 3 ++-
 hw/xwayland/xwayland-glamor-gbm.c | 3 +--
 hw/xwayland/xwayland-glamor-gbm.h | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/xwayland/xwayland-dmabuf.c b/hw/xwayland/xwayland-dmabuf.c
index 7617a0e5f..e5432217b 100644
--- a/hw/xwayland/xwayland-dmabuf.c
+++ b/hw/xwayland/xwayland-dmabuf.c
@@ -31,6 +31,7 @@
 #include <wayland-util.h>
 
 #include "xwayland-dmabuf.h"
+#include "xwayland-glamor-gbm.h"
 #include "xwayland-screen.h"
 #include "xwayland-types.h"
 #include "xwayland-window-buffers.h"
@@ -176,7 +177,7 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
      * the compositor told us.
      */
     if (xwl_screen->gbm_backend.is_available)
-        return xwl_screen->gbm_backend.get_main_device(xwl_screen);
+        return xwl_gbm_get_main_device(xwl_screen);
     else
         return xwl_screen->default_feedback.main_dev;
 }
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index bab5b39a6..37499d3f0 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -1272,7 +1272,7 @@ error:
     return FALSE;
 }
 
-static drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen)
+drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen)
 {
     struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
 
@@ -1301,7 +1301,6 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
     dixSetPrivate(&xwl_screen->screen->devPrivates, &xwl_gbm_private_key,
                   xwl_gbm);
 
-    xwl_screen->gbm_backend.get_main_device = xwl_gbm_get_main_device;
     xwl_screen->gbm_backend.is_available = TRUE;
     xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH |
                                             XWL_EGL_BACKEND_NEEDS_N_BUFFERING;
diff --git a/hw/xwayland/xwayland-glamor-gbm.h b/hw/xwayland/xwayland-glamor-gbm.h
index a13d89c11..34fcb3541 100644
--- a/hw/xwayland/xwayland-glamor-gbm.h
+++ b/hw/xwayland/xwayland-glamor-gbm.h
@@ -32,11 +32,14 @@
 
 #include <sys/types.h>
 
+#include <xf86drm.h>
+
 #include "xwayland-types.h"
 
 void xwl_glamor_init_gbm(struct xwl_screen *xwl_screen);
 Bool xwl_glamor_has_wl_drm(struct xwl_screen *xwl_screen);
 Bool xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen);
 Bool xwl_glamor_gbm_init_screen(struct xwl_screen *xwl_screen);
+drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen);
 
 #endif /* XWAYLAND_GLAMOR_GBM_H */