X11Libre · stefan11111 · Sep 12, 2026 · Sep 12, 2026 · Sep 13, 2026 · Sep 13, 2026
diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man
@@ -57,7 +57,10 @@ enables DRI3 support for the X server.
 force enables glamor render acceleration (even on top of sw renderers like softpipe/llvmpipe).
 .TP 8
 .B -gbm
-allows glamor to use libgbm (it is only used for matching EGLDeviceEXT's to dri fd's).
+allows glamor to use libgbm.
+.TP 8
+.B -nogbm
+forces glamor to not use libgbm.
 .TP 8
 .B -direct-dri3
 Forces glamor to use the direct implementation of DRI3.

diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
@@ -139,7 +139,7 @@ processScreenOrOutputArg(const char *screen_size, const char *output, char *pare
         unsigned long p_id = 0;
         Bool use_geometry;
 
-        screen = KdScreenInfoAdd(card);
+        screen = KdScreenInfoAdd(card, NULL);
         KdParseScreen(screen, screen_size);
         screen->driver = calloc(1, sizeof(EphyrScrPriv));
         if (!screen->driver)

diff --git a/hw/kdrive/fake/fake.h b/hw/kdrive/fake/fake.h
@@ -38,15 +38,11 @@ typedef struct _fakePriv {
 typedef struct _fakeScrPriv {
     Rotation randr;
     Bool shadow;
-#ifdef GLAMOR
-    int dri_fd;
-#endif
 } FakeScrPriv;
 
 typedef struct _fakeScreenConf {
     int shadow;
     KdGlamorInfo glamor_info;
-    const char *dri_path;
 } FakeScreenConf;
 
 extern KdCardFuncs fakeFuncs;

diff --git a/hw/kdrive/fake/fake_glamor.c b/hw/kdrive/fake/fake_glamor.c
@@ -5,77 +5,17 @@
 
 #include <kdrive-config.h>
 
-#include "present.h"
-#include "Xext/present/present_priv.h" /* extern uint32_t FakeScreenFps; */
-
 #include "fake.h"
 #include "kglamor.h"
 
-#include "glamor.h"
-
-#ifdef WITH_LIBDRM
-#include <xf86drm.h>
-#endif
-
-#include <errno.h>
-
 Bool
 fakeInitAccel(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
-    FakeScrPriv *scrpriv = screen->driver;
     FakeScreenConf *config = screen->card->closure;
-    int caps = GLAMOR_EGL_CAP_NONE;
-    int has_dri3;
-
-    if (config->dri_path) {
-        scrpriv->dri_fd = open(config->dri_path, O_RDWR);
-        if (scrpriv->dri_fd >= 0) {
-#ifdef WITH_LIBDRM
-            drmDropMaster(scrpriv->dri_fd);
-#endif
-        } else {
-            LogMessage(X_WARNING, "Xfake(%d): Could not open %s: %s\n", pScreen->myNum, config->dri_path, strerror(errno));
-        }
-    } else {
-        scrpriv->dri_fd = -1;
-    }
-
-    config->glamor_info.dri_fd = scrpriv->dri_fd;
 
-    if (!KdGlamorInit(pScreen, &config->glamor_info, &caps)) {
-        if (scrpriv->dri_fd >= 0) {
-            close(scrpriv->dri_fd);
-            scrpriv->dri_fd = -1;
-            config->glamor_info.dri_fd = -1;
-        }
-        return FALSE;
-    }
-
-#define GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT (GLAMOR_EGL_CAP_DRI3_IMPORT | GLAMOR_EGL_CAP_DRI3_EXPORT)
-    has_dri3 = (caps & GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT) == GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT;
-    LogMessage(X_INFO, "Xfake(%d): DRI3 %s initialized\n", pScreen->myNum, has_dri3 ? "" : "not");
-
-#if 0 /* Not yet implemented */
-    LogMessage(X_INFO, "Xfake(%d): DRI3 explicit sync %s\n", pScreen->myNum,
-               (caps & GLAMOR_EGL_CAP_DRI3_SYNCOBJ) ?
-               "available" : "unavailable");
-#endif
-
-    if (scrpriv->dri_fd >= 0) {
-        /*
-         * X clients use present to try to synchronize with the screen
-         * If no global fake rate was requested, use the highest value dix accepts (600)
-         */
-        if (!FakeScreenFps) {
-            FakeScreenFps = 600;
-            present_screen_init(pScreen, NULL);
-            FakeScreenFps = 0;
-        }
-    }
-
-    return TRUE;
+    return KdGlamorInit(pScreen, &config->glamor_info, NULL);
 }
 
 void
@@ -95,11 +35,7 @@ fakeFiniAccel(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
-    FakeScrPriv *scrpriv = screen->driver;
-
-    KdGlamorFini(pScreen);
+    FakeScreenConf *config = screen->card->closure;
 
-    if (scrpriv->dri_fd >= 0) {
-        close(scrpriv->dri_fd);
-    }
+    KdGlamorFini(pScreen, &config->glamor_info);
 }
diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c
@@ -32,14 +32,14 @@ static FakeScreenConf *fakeCurrScreen = NULL;
 
 static const FakeScreenConf fakeDefaultConfig = {
                                                  .shadow = -1,
+                                                 .glamor_info = {.fake_rate = -1, .drop_master = TRUE,},
                                                 };
 
 void
 InitCard(char *name)
 {
     fakeCurrScreen = XNFalloc(sizeof(*fakeCurrScreen));
     *fakeCurrScreen = fakeDefaultConfig;
-    fakeCurrScreen->glamor_info = kdGlamorDefault;
     KdCardInfoAdd(&fakeFuncs, fakeCurrScreen);
 }
 
@@ -100,7 +100,7 @@ ddxProcessArgument(int argc, char **argv, int i)
         return 1;
     }
 
-    glamor_arg = KdGlamorParse(&fakeCurrScreen->glamor_info, &fakeCurrScreen->dri_path, argc, argv, i);
+    glamor_arg = KdGlamorParse(&fakeCurrScreen->glamor_info, argc, argv, i);
     if (glamor_arg) {
         return glamor_arg;
     }

diff --git a/hw/kdrive/fake/meson.build b/hw/kdrive/fake/meson.build
@@ -4,10 +4,8 @@ srcs = [
     '../../stubs/ddxBeforeReset.c',
 ]
 
-fake_glamor = []
 if build_glamor
     srcs += 'fake_glamor.c'
-    fake_glamor += glamor
 endif
 
 xfake_server = executable(
@@ -18,10 +16,9 @@ xfake_server = executable(
         include_directories('../src'),
         include_directories('../os/stub'),
     ],
-    dependencies: [ common_dep, libdrm_dep ],
+    dependencies: common_dep,
     link_with: [
         libxserver_main,
-        fake_glamor,
         kdrive,
         stub,
         libxserver_fb,

diff --git a/hw/kdrive/fbdev/fb_glamor.c b/hw/kdrive/fbdev/fb_glamor.c
@@ -5,78 +5,17 @@
 
 #include <kdrive-config.h>
 
-#include "present.h"
-#include "Xext/present/present_priv.h" /* extern uint32_t FakeScreenFps; */
-
 #include "fbdev.h"
 #include "kglamor.h"
 
-#include "glamor.h"
-
-#ifdef WITH_LIBDRM
-#include <xf86drm.h>
-#endif
-
-#include <errno.h>
-
 Bool
 fbdevInitAccel(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
-    FbdevScrPriv *scrpriv = screen->driver;
     FbScreenConf *config = screen->card->closure;
-    int caps = GLAMOR_EGL_CAP_NONE;
-    int has_dri3;
-
-    if (config->dri_path) {
-        scrpriv->dri_fd = open(config->dri_path, O_RDWR);
-        if (scrpriv->dri_fd >= 0) {
-#ifdef WITH_LIBDRM
-            drmDropMaster(scrpriv->dri_fd);
-#endif
-        } else {
-            LogMessage(X_WARNING, "Xfbdev(%d): Could not open %s: %s\n", pScreen->myNum, config->dri_path, strerror(errno));
-        }
-    } else {
-        scrpriv->dri_fd = -1;
-    }
-
-    config->glamor_info.dri_fd = scrpriv->dri_fd;
 
-    if (!KdGlamorInit(pScreen, &config->glamor_info, &caps)) {
-        if (scrpriv->dri_fd >= 0) {
-            close(scrpriv->dri_fd);
-            scrpriv->dri_fd = -1;
-            config->glamor_info.dri_fd = -1;
-        }
-        return FALSE;
-    }
-
-#define GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT (GLAMOR_EGL_CAP_DRI3_IMPORT | GLAMOR_EGL_CAP_DRI3_EXPORT)
-    has_dri3 = (caps & GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT) == GLAMOR_EGL_CAP_DRI3_IMPORT_EXPORT;
-    LogMessage(X_INFO, "Xfbdev(%d): DRI3 %s initialized\n", pScreen->myNum, has_dri3 ? "" : "not");
-
-#if 0 /* Not yet implemented */
-    LogMessage(X_INFO, "Xfbdev(%d): DRI3 explicit sync %s\n", pScreen->myNum,
-               (caps & GLAMOR_EGL_CAP_DRI3_SYNCOBJ) ?
-               "available" : "unavailable");
-#endif
-
-    if (scrpriv->dri_fd >= 0) {
-        /*
-         * X clients use present to try to synchronize with the screen
-         * If no global fake rate was requested and the screen's rate is sane,
-         * use that instead of the 60 fps default
-         */
-        if (!FakeScreenFps && (screen->rate >= 60) && (screen->rate <= 600)) {
-            FakeScreenFps = screen->rate;
-            present_screen_init(pScreen, NULL);
-            FakeScreenFps = 0;
-        }
-    }
-
-    return TRUE;
+    return KdGlamorInit(pScreen, &config->glamor_info, NULL);
 }
 
 void
@@ -96,11 +35,7 @@ fbdevFiniAccel(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
-    FbdevScrPriv *scrpriv = screen->driver;
-
-    KdGlamorFini(pScreen);
+    FbScreenConf *config = screen->card->closure;
 
-    if (scrpriv->dri_fd >= 0) {
-        close(scrpriv->dri_fd);
-    }
+    KdGlamorFini(pScreen, &config->glamor_info);
 }
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
@@ -42,8 +42,8 @@ fbdevInitialize(KdCardInfo * card, FbdevPriv * priv)
     if (config->fb_path) {
         priv->fd = open(config->fb_path, O_RDWR);
         if (priv->fd < 0) {
-            ErrorF("Error opening framebuffer %s: %s\n",
-                   config->fb_path, strerror(errno));
+            LogMessage(X_ERROR, "Xfbdev(%d): Error opening framebuffer %s: %s\n",
+                       card->mynum, config->fb_path, strerror(errno));
             return FALSE;
         }
         LogMessage(X_INFO, "Xfbdev(%d): Using framebuffer device: %s\n",
@@ -67,7 +67,7 @@ fbdevInitialize(KdCardInfo * card, FbdevPriv * priv)
             }
         }
         if (priv->fd < 0) {
-            ErrorF("Error opening framebuffers /dev/fb[0-31]\n");
+            LogMessage(X_ERROR, "Xfbdev(%d): Error opening framebuffers /dev/fb[0-31]\n", card->mynum);
             return FALSE;
         }
         LogMessage(X_INFO, "Xfbdev(%d): Using framebuffer device: %s\n", card->mynum, devbuf);

diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h
@@ -48,16 +48,12 @@ typedef struct _fbdevScrPriv {
     Bool shadow;
     int max_width;
     int max_height;
-#ifdef GLAMOR
-    int dri_fd;
-#endif
 } FbdevScrPriv;
 
 typedef struct _fbScreenConf {
     const char *fb_path;
     Bool shadow;
     KdGlamorInfo glamor_info;
-    const char *dri_path;
 } FbScreenConf;
 
 extern KdCardFuncs fbdevFuncs;

diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
@@ -36,6 +36,7 @@ static FbScreenConf *fbCurrScreen = NULL;
 static const FbScreenConf fbDefaultConfig = {
                                              .fb_path = NULL,
                                              .shadow = TRUE,
+                                             .glamor_info = {.fake_rate = -1, .drop_master = TRUE,},
                                             };
 
 static void fbdevLogScreenInfo(const FbScreenConf *config, int screen_num);
@@ -65,7 +66,6 @@ FbdevLogInit(void)
         }
     } else {
         FbScreenConf fbDummyConfig = fbDefaultConfig;
-        fbDummyConfig.glamor_info = kdGlamorDefault;
         fbdevLogScreenInfo(&fbDummyConfig, 0);
     }
 }
@@ -75,7 +75,6 @@ InitCard(char *name)
 {
     fbCurrScreen = XNFalloc(sizeof(*fbCurrScreen));
     *fbCurrScreen = fbDefaultConfig;
-    fbCurrScreen->glamor_info = kdGlamorDefault;
     KdCardInfoAdd(&fbdevFuncs, fbCurrScreen);
 }
 
@@ -89,26 +88,7 @@ fbdevLogScreenInfo(const FbScreenConf *config, int screen_num)
     LogMessage(X_INFO, "Xfbdev(%d): ShadowFB %s\n", screen_num,
                config->shadow ? "enabled" : "disabled");
 
-    LogMessage(X_INFO, "Xfbdev(%d): glvnd library: %s\n", screen_num,
-               config->glamor_info.glvnd ? config->glamor_info.glvnd : "not passed");
-
-    LogMessage(X_INFO, "Xfbdev(%d): dri device: %s\n", screen_num,
-               config->dri_path ? config->dri_path : "none");
-
-    LogMessage(X_INFO, "Xfbdev(%d): glamor OpenGL contexts %s\n", screen_num,
-               !config->glamor_info.force_es ? "allowed" : "forbidden");
-    LogMessage(X_INFO, "Xfbdev(%d): glamor GLES contexts %s\n", screen_num,
-               !config->glamor_info.force_gl ? "allowed" : "forbidden");
-
-    LogMessage(X_INFO, "Xfbdev(%d): glamor render acceleration %s\n", screen_num,
-               !config->glamor_info.no_render_accel ? "enabled" : "disabled");
-    LogMessage(X_INFO, "Xfbdev(%d): glamor render acceleration %s on software renderers\n", screen_num,
-               config->glamor_info.force_render_accel ? "allowed" : "forbidden");
-    LogMessage(X_INFO, "Xfbdev(%d): glamor is %s libgbm \n", screen_num,
-               config->glamor_info.use_gbm ? "allowed to use" : "forbidden from using");
-
-    LogMessage(X_INFO, "Xfbdev(%d): glamor X-Video support %s\n", screen_num,
-               config->glamor_info.use_xv ? "allowed" : "forbidden");
+    KdGlamorLogScreenInfo(&config->glamor_info, screen_num);
     LogMessage(X_INFO, "\n");
 }
 
@@ -173,7 +153,7 @@ ddxProcessArgument(int argc, char **argv, int i)
         return 1;
     }
 
-    glamor_arg = KdGlamorParse(&fbCurrScreen->glamor_info, &fbCurrScreen->dri_path, argc, argv, i);
+    glamor_arg = KdGlamorParse(&fbCurrScreen->glamor_info, argc, argv, i);
     if (glamor_arg) {
         return glamor_arg;
     }

diff --git a/hw/kdrive/fbdev/meson.build b/hw/kdrive/fbdev/meson.build
@@ -4,10 +4,8 @@ srcs = [
     '../../stubs/ddxBeforeReset.c',
 ]
 
-fbdev_glamor = []
 if build_glamor
     srcs += 'fb_glamor.c'
-    fbdev_glamor += glamor
 endif
 
 xfbdev_server = executable(
@@ -18,10 +16,9 @@ xfbdev_server = executable(
         include_directories('../src'),
         include_directories('../os/linux'),
     ],
-    dependencies: [ common_dep, libdrm_dep ],
+    dependencies: common_dep,
     link_with: [
         libxserver_main,
-        fbdev_glamor,
         kdrive,
         linux,
         libxserver_fb,