From 6da5a33d54dfe5370acf3d09ec8f1f292df0f5ae Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 14 May 2024 13:17:31 +0200 Subject: [PATCH] bump minimal xorg version to 1.18 1.18 was released a decade ago, so it seems reasonable stop supporting older ones. Signed-off-by: Enrico Weigelt, metux IT consult --- .gitlab-ci.yml | 12 +----------- conf/Makefile.am | 2 -- configure.ac | 30 +----------------------------- src/radeon.h | 19 ------------------- src/radeon_dri3.c | 17 ----------------- src/radeon_kms.c | 4 ---- src/radeon_present.c | 16 ---------------- src/radeon_sync.c | 21 --------------------- 8 files changed, 2 insertions(+), 119 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cd462b6..c4cf94e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,7 +114,7 @@ build-gcc: - .default_build parallel: matrix: - - XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19", "1.20"] + - XSERVER_VERSION: ["1.18", "1.19", "1.20"] build-clang: extends: @@ -124,13 +124,3 @@ build-clang: - XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"] variables: CC: clang - -build-noglamor: - extends: - - .default_build - script: - - ./autogen.sh --disable-glamor - - make -j${FDO_CI_CONCURRENT:-4} check V=1 - parallel: - matrix: - - XSERVER_VERSION: ["1.13", "1.14", "1.15"] diff --git a/conf/Makefile.am b/conf/Makefile.am index fba75dac..966b1686 100644 --- a/conf/Makefile.am +++ b/conf/Makefile.am @@ -19,6 +19,4 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -if HAS_XORG_CONF_DIR dist_config_DATA = 10-radeon.conf -endif diff --git a/configure.ac b/configure.ac index 29302a56..097f37e6 100644 --- a/configure.ac +++ b/configure.ac @@ -75,18 +75,12 @@ PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.89]) PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon]) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.13 xproto fontsproto xf86driproto $REQUIRED_MODULES]) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto xf86driproto $REQUIRED_MODULES]) PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), HAVE_XEXTPROTO_71="no") AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) -# Section "OutputClass" is only supported as of xserver 1.16 -PKG_CHECK_EXISTS([xorg-server >= 1.16], - [sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`], - [sysconfigdir=""]) -AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"]) - # Define a configure option for an alternate X Server configuration directory AC_ARG_WITH(xorg-conf-dir, AS_HELP_STRING([--with-xorg-conf-dir=DIR], @@ -155,34 +149,12 @@ else fi AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno) -AC_CHECK_DECL(RegionDuplicate, - [AC_DEFINE(HAVE_REGIONDUPLICATE, 1, - [Have RegionDuplicate API])], [], - [#include - #include ]) - AC_CHECK_DECL(xf86CursorResetCursor, [AC_DEFINE(HAVE_XF86_CURSOR_RESET_CURSOR, 1, [Have xf86CursorResetCursor API])], [], [#include #include ]) -AC_CHECK_HEADERS([misyncshm.h], [], [], - [#include - #include - #include - #include ]) - -AC_CHECK_HEADERS([present.h], [], [], - [#include - #include - #include "xorg-server.h" - #include ]) - -AC_CHECK_HEADERS([dri3.h], [], [], - [#include - #include ]) - CPPFLAGS="$SAVE_CPPFLAGS" PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) diff --git a/src/radeon.h b/src/radeon.h index d8a17516..6bb8c56a 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -97,25 +97,6 @@ struct _SyncFence; -#ifndef HAVE_REGIONDUPLICATE - -static inline RegionPtr -RegionDuplicate(RegionPtr pOld) -{ - RegionPtr pNew; - - pNew = RegionCreate(&pOld->extents, 0); - if (!pNew) - return NULL; - if (!RegionCopy(pNew, pOld)) { - RegionDestroy(pNew); - return NULL; - } - return pNew; -} - -#endif - #ifndef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) #endif diff --git a/src/radeon_dri3.c b/src/radeon_dri3.c index 3136de30..7daa53ab 100644 --- a/src/radeon_dri3.c +++ b/src/radeon_dri3.c @@ -27,9 +27,6 @@ #endif #include "radeon.h" - -#ifdef HAVE_DRI3_H - #include "radeon_bo_gem.h" #include "radeon_glamor.h" #include "dri3.h" @@ -243,17 +240,3 @@ radeon_dri3_screen_init(ScreenPtr screen) return TRUE; } - -#else /* !HAVE_DRI3_H */ - -Bool -radeon_dri3_screen_init(ScreenPtr screen) -{ - xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO, - "Can't initialize DRI3 because dri3.h not available at " - "build time\n"); - - return FALSE; -} - -#endif diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 1be166cd..4ebf25bf 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -43,12 +43,8 @@ #include "radeon_version.h" #include "shadow.h" #include - #include "atipciids.h" - -#if HAVE_PRESENT_H #include -#endif /* DPMS */ #ifdef HAVE_XEXTPROTO_71 diff --git a/src/radeon_present.c b/src/radeon_present.c index 303e187f..62923d21 100644 --- a/src/radeon_present.c +++ b/src/radeon_present.c @@ -27,8 +27,6 @@ #include "radeon.h" -#ifdef HAVE_PRESENT_H - #include #include #include @@ -486,17 +484,3 @@ radeon_present_screen_init(ScreenPtr screen) return TRUE; } - -#else /* !HAVE_PRESENT_H */ - -Bool -radeon_present_screen_init(ScreenPtr screen) -{ - xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO, - "Present extension disabled because present.h not available at " - "build time\n"); - - return FALSE; -} - -#endif diff --git a/src/radeon_sync.c b/src/radeon_sync.c index 86e0283f..180fc95e 100644 --- a/src/radeon_sync.c +++ b/src/radeon_sync.c @@ -23,8 +23,6 @@ #include "radeon.h" -#ifdef HAVE_MISYNCSHM_H - #include "misync.h" #include "misyncshm.h" #include "misyncstr.h" @@ -131,22 +129,3 @@ radeon_sync_close(ScreenPtr screen) info->CreateFence = NULL; } - -#else /* !HAVE_MISYNCSHM_H */ - -Bool -radeon_sync_init(ScreenPtr screen) -{ - xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO, - "SYNC extension fences disabled because misyncshm.h not " - "available at build time\n"); - - return FALSE; -} - -void -radeon_sync_close(ScreenPtr screen) -{ -} - -#endif