diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 354e5b6a7..d015e0f84 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1104,7 +1104,8 @@ drmmode_bo_import(drmmode_ptr drmmode, drmmode_bo *bo,
 
 static Bool
 drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
-                  unsigned width, unsigned height, unsigned bpp)
+                  unsigned width, unsigned height, unsigned bpp,
+                  uint32_t gbm_bo_use_flag)
 {
     bo->width = width;
     bo->height = height;
@@ -1137,9 +1138,16 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
                                           FALSE, TRUE);
         if (num_modifiers > 0 &&
             !(num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID)) {
+#ifdef GBM_BO_WITH_MODIFIERS2
+            bo->gbm = gbm_bo_create_with_modifiers2(drmmode->gbm, width, height,
+                                                    format, modifiers,
+                                                    num_modifiers,
+                                                    GBM_BO_USE_SCANOUT | gbm_bo_use_flag);
+#else
             bo->gbm = gbm_bo_create_with_modifiers(drmmode->gbm, width, height,
                                                    format, modifiers,
                                                    num_modifiers);
+#endif
             free(modifiers);
             if (bo->gbm) {
                 bo->used_modifiers = TRUE;
@@ -1149,7 +1157,7 @@ drmmode_create_bo(drmmode_ptr drmmode, drmmode_bo *bo,
 #endif
 
         bo->gbm = gbm_bo_create(drmmode->gbm, width, height, format,
-                                GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT);
+                                GBM_BO_USE_RENDERING | GBM_BO_USE_SCANOUT | gbm_bo_use_flag);
         bo->used_modifiers = FALSE;
         return bo->gbm != NULL;
     }
@@ -2111,7 +2119,7 @@ drmmode_shadow_fb_allocate(xf86CrtcPtr crtc, int width, int height,
     drmmode_ptr drmmode = drmmode_crtc->drmmode;
     int ret;
 
-    if (!drmmode_create_bo(drmmode, bo, width, height, drmmode->kbpp)) {
+    if (!drmmode_create_bo(drmmode, bo, width, height, drmmode->kbpp, 0)) {
         xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR,
                "Couldn't allocate shadow memory for rotated CRTC\n");
         return NULL;
@@ -3663,7 +3671,12 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
     drmmode->fb_id = 0;
 
     if (!drmmode_create_bo(drmmode, &drmmode->front_bo,
-                           width, height, drmmode->kbpp))
+                           width, height, drmmode->kbpp,
+#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING
+                           GBM_BO_USE_FRONT_RENDERING))
+#else
+                           0))
+#endif
         goto fail;
 
     pitch = drmmode_bo_get_pitch(&drmmode->front_bo);
@@ -4444,7 +4457,12 @@ drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
     width = pScrn->virtualX;
     height = pScrn->virtualY;
 
-    if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp))
+    if (!drmmode_create_bo(drmmode, &drmmode->front_bo, width, height, bpp,
+#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING
+                           GBM_BO_USE_FRONT_RENDERING))
+#else
+                           0))
+#endif
         return FALSE;
     pScrn->displayWidth = drmmode_bo_get_pitch(&drmmode->front_bo) / cpp;
 
diff --git a/include/meson.build b/include/meson.build
index 2393c1625..03278ca1d 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -116,6 +116,8 @@ conf_data.set('GBM_BO_FD_FOR_PLANE',
               build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 21.1') ? '1' : false)
 conf_data.set('GBM_BO_WITH_MODIFIERS2',
               build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 21.3') ? '1' : false)
+conf_data.set('HAVE_GBM_BO_USE_FRONT_RENDERING',
+              build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 22.3') ? '1' : false)
 
 conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))