From 05eac74cbda4491943f7327aaf6884a565deb2df Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Fri, 24 May 2024 15:52:12 +0200
Subject: drop unused XGI_CP code pathes

These seem never to have been enabled, so probably not needed at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-xgi/-/merge_requests/6>
---
 src/init.h       |  3 ---
 src/xgi.h        | 10 +---------
 src/xgi_driver.c |  8 +-------
 src/xgi_opt.c    | 18 ------------------
 4 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/src/init.h b/src/init.h
index e8696e6..7d1f490 100644
--- a/src/init.h
+++ b/src/init.h
@@ -65,9 +65,6 @@
 #endif
 
 #ifdef LINUX_KERNEL
-#ifdef XGI_CP
-#undef XGI_CP
-#endif
 #include <linux/config.h>
 #include <linux/version.h>
 #include <linux/types.h>
diff --git a/src/xgi.h b/src/xgi.h
index 8d61bbd..1adcf3c 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -136,8 +136,6 @@ extern Bool g_bRunTimeDebug;
 /* Always unlock the registers (should be set!) */
 #define UNLOCK_ALWAYS
 
-#undef XGI_CP
-
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
 #else
@@ -538,10 +536,6 @@ typedef struct {
     unsigned char       *RenderAccelArray;
     unsigned char *	FbBase1;
     unsigned long	OnScreenSize1;
-
-#ifdef XGI_CP
-    XGI_CP_H_ENT
-#endif
 } XGIEntRec, *XGIEntPtr;
 
 #define XGIPTR(p)       ((XGIPtr)((p)->driverPrivate))
@@ -779,9 +773,7 @@ typedef struct {
     Atom		xvDisableColorkey, xvUseChromakey, xvChromaMin, xvChromaMax;
     Atom		xvInsideChromakey, xvYUVChromakey;
     Atom		xvGammaRed, xvGammaGreen, xvGammaBlue;
-#ifdef XGI_CP
-    XGI_CP_H
-#endif
+
     unsigned long       ChipFlags;
     unsigned long       XGI_SD_Flags;
     BOOLEAN		UseHWARGBCursor;
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 80d5218..1fad69a 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -3356,9 +3356,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
         }
     }
 
-#ifdef XGI_CP
-    XGI_CP_DRIVER_RECONFIGOPT
-#endif
         /* Do some MergedFB mode initialisation */
 #ifdef XGIMERGED
         if (pXGI->MergedFB) {
@@ -5974,10 +5971,7 @@ XGIPreSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, int viewmode)
             }
 
             CR31 &= ~0x04;      /* Clear NotSimuMode */
-#ifdef XGI_CP
-            XGI_CP_DRIVER_CONFIG
-#endif
-                break;
+            break;
 
         case CRT2_LCD:
             CR30 |= 0x20;
diff --git a/src/xgi_opt.c b/src/xgi_opt.c
index 4dda66c..d3185f1 100644
--- a/src/xgi_opt.c
+++ b/src/xgi_opt.c
@@ -102,9 +102,6 @@ typedef enum {
 	OPTION_IGNORE_DDC,     /* Jong@09032009 */
 	OPTION_NONDDC_DEFAULT_MODE, /* Jong@09042009 */
 	OPTION_GAMMA_RGB,			/* Jong@09092009 */
-#ifdef XGI_CP
-    XGI_CP_OPT_OPTIONS
-#endif
     OPTION_PSEUDO
 } XGIOpts;
 
@@ -168,9 +165,6 @@ static const OptionInfoRec XGIOptions[] = {
     { OPTION_NOXGIXINERAMA2,		"NoTwinviewXineramaInfo", OPTV_BOOLEAN,   {0}, FALSE },   /* alias */
     { OPTION_CRT2ISSCRN0,		"MergedXineramaCRT2IsScreen0",OPTV_BOOLEAN,{0},FALSE },
 #endif
-#endif
-#ifdef XGI_CP
-    XGI_CP_OPTION_DETAIL
 #endif
     { -1,                       	NULL,                     OPTV_NONE,      {0}, FALSE }
 };
@@ -265,10 +259,6 @@ xgiOptions(ScrnInfoPtr pScrn)
     pXGI->CRT2IsScrn0 = FALSE;
 #endif
 #endif
-#ifdef XGI_CP
-    XGI_CP_OPT_DEFAULT
-#endif
-
 
     /* Collect the options */
 
@@ -486,9 +476,6 @@ xgiOptions(ScrnInfoPtr pScrn)
        if(xf86GetOptValBool(pXGI->Options, OPTION_CRT2GAMMA, &val)) {
           xf86DrvMsg(pScrn->scrnIndex, X_WARNING, mystring, "CRT2Gamma");
        }
-#ifdef XGI_CP
-       XGI_CP_OPT_DH_WARN
-#endif
     }
     else {
 	  /* TurboQueue */
@@ -499,11 +486,6 @@ xgiOptions(ScrnInfoPtr pScrn)
           }
           xf86DrvMsg(pScrn->scrnIndex, from, "TurboQueue %s\n",
                     pXGI->TurboQueue ? enabledstr : disabledstr);
-
-#ifdef XGI_CP
-       XGI_CP_OPT_DOOPT
-#endif
-
     }  /* DualHead */
 
     /* CRT1Gamma - enable/disable gamma correction for CRT1
-- 
cgit v1.2.3