From caa04ba605bbbf0a1b8d819b9c810ae49b4e2dac Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 22 May 2024 22:38:37 +0200
Subject: [PATCH] drop compat with video api major version < 20

Since we're relying on xserver >= 1.18, we can assume video api
major version >= 20.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 src/geode_driver.c |  3 ---
 src/gx_driver.c    |  3 ---
 src/gx_randr.c     | 14 --------------
 src/lx_driver.c    |  3 ---
 4 files changed, 23 deletions(-)

diff --git a/src/geode_driver.c b/src/geode_driver.c
index e16ea72..3185db8 100644
--- a/src/geode_driver.c
+++ b/src/geode_driver.c
@@ -42,9 +42,6 @@
 /* Includes that are used by all drivers */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-#include "xf86Resources.h"
-#endif
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/gx_driver.c b/src/gx_driver.c
index 2a45e61..e858ad3 100644
--- a/src/gx_driver.c
+++ b/src/gx_driver.c
@@ -38,9 +38,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-#include "xf86Resources.h"
-#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mipointer.h"
diff --git a/src/gx_randr.c b/src/gx_randr.c
index e38da53..64a66eb 100644
--- a/src/gx_randr.c
+++ b/src/gx_randr.c
@@ -61,16 +61,9 @@ typedef struct _GXRandRInfo {
 
 static DevPrivateKeyRec GXRandRIndex;
 
-#define OLD_VIDEODRV_INTERFACE (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 4)
-
-#if OLD_VIDEODRV_INTERFACE
-#define XF86RANDRINFO(p)   ((XF86RandRInfoPtr) (p)->devPrivates[GXRandRIndex].ptr)
-#define XF86RANDRSET(p, v) (p)->devPrivates[GXRandRIndex].ptr = v
-#else
 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr)						\
 			  dixLookupPrivate(&(p)->devPrivates, &GXRandRIndex))
 #define XF86RANDRSET(p, v) dixSetPrivate(&(p)->devPrivates, &GXRandRIndex, v)
-#endif
 
 static int
 GXRandRModeRefresh(DisplayModePtr mode)
@@ -164,11 +157,7 @@ GXRandRSetMode(ScreenPtr pScreen,
     int oldmmWidth = pScreen->mmWidth;
     int oldmmHeight = pScreen->mmHeight;
 
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8
-    WindowPtr pRoot = WindowTable[pScreen->myNum];
-#else
     WindowPtr pRoot = pScreen->root;
-#endif
     DisplayModePtr currentMode = NULL;
     Bool ret = TRUE;
 
@@ -343,9 +332,6 @@ GXRandRInit(ScreenPtr pScreen, int rotation)
     if (GXRandRGeneration != serverGeneration) {
         GXRandRGeneration = serverGeneration;
     }
-#if OLD_VIDEODRV_INTERFACE
-    GXRandRIndex = AllocateScreenPrivateIndex();
-#endif
     if (!dixRegisterPrivateKey(&GXRandRIndex, PRIVATE_SCREEN, 0))
         return FALSE;
 
diff --git a/src/lx_driver.c b/src/lx_driver.c
index a199310..794e830 100644
--- a/src/lx_driver.c
+++ b/src/lx_driver.c
@@ -39,9 +39,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-#include "xf86Resources.h"
-#endif
 #include "xf86i2c.h"
 #include "xf86Crtc.h"
 #include "xf86cmap.h"