From c209a55f0e6789e08906b60a3ed4ece03a7a2114 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 14 Jul 2025 22:11:33 +0200 Subject: [PATCH] drop support for xserver version < 1.19.99.1 Signed-off-by: Enrico Weigelt, metux IT consult --- src/drmmode_display.c | 9 +-------- src/radeon_glamor.c | 15 ++------------- src/radeon_probe.c | 4 ---- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 400f5e0d..bd7c2566 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -44,11 +44,6 @@ #include "radeon_bo_helper.h" #include "radeon_glamor.h" #include "radeon_reg.h" - -#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0) -#include -#endif - #include "drmmode_display.h" /* DPMS */ @@ -434,9 +429,7 @@ destroy_pixmap_for_fbcon(ScrnInfoPtr pScrn) * avoid issues due to a GEM handle lifetime conflict between us and * Mesa */ - if (info->use_glamor && - (info->ChipFamily >= CHIP_FAMILY_CAYMAN || - xorgGetVersion() >= XORG_VERSION_NUMERIC(1,19,99,1,0))) + if (info->use_glamor) return; if (info->fbcon_pixmap) diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 6881a33e..b1c6df0f 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -115,14 +115,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) return FALSE; } - if (scrn->depth == 30 && - xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, - "Depth 30 is not supported by GLAMOR with Xorg < " - "1.19.99.1\n"); - return FALSE; - } - info->gbm = gbm_create_device(pRADEONEnt->fd); if (!info->gbm) { xf86DrvMsg(scrn->scrnIndex, X_ERROR, @@ -168,11 +160,8 @@ radeon_glamor_create_textured_pixmap(PixmapPtr pixmap, struct radeon_buffer *bo) if (bo->flags & RADEON_BO_FLAGS_GBM) { return glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap, - bo->bo.gbm -#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,19,99,903,0) - , FALSE -#endif - ); + bo->bo.gbm, + FALSE); } else { return glamor_egl_create_textured_pixmap(pixmap, bo->bo.radeon->handle, diff --git a/src/radeon_probe.c b/src/radeon_probe.c index ab8e9348..dd6c8b84 100644 --- a/src/radeon_probe.c +++ b/src/radeon_probe.c @@ -49,11 +49,7 @@ #include "xf86drmMode.h" -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,19,99,1,0) #include -#else -#include "dri.h" -#endif #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include