From 62da64b8f0bd5d671ecc239394ece58f04c9fdfd Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 17 Nov 2006 16:51:18 -0800
Subject: [PATCH] Remove various unused HW cursor and screen size limit related
 struct fields.

---
 src/xgi.h        | 7 -------
 src/xgi_driver.c | 1 -
 src/xgi_opt.c    | 2 --
 3 files changed, 10 deletions(-)

diff --git a/src/xgi.h b/src/xgi.h
index 56e9acf..3d4b7f1 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -884,10 +884,6 @@ typedef struct {
     CARD32 *            CurARGBDest;
     int			GammaBriR, GammaBriG, GammaBriB;
     int			GammaPBriR, GammaPBriG, GammaPBriB;
-    Bool		HideHWCursor;  /* Custom application */
-    Bool		HWCursorIsVisible;
-    unsigned long       HWCursorBackup[16];
-    int			HWCursorMBufNum, HWCursorCBufNum;
     unsigned long	mmioSize;
 #ifdef XGIMERGED
     Bool		MergedFB, MergedFBAuto;
@@ -905,9 +901,6 @@ typedef struct {
     Bool		CheckForCRT2;
     Bool		IsCustomCRT2;
     BOOLEAN 		HaveCustomModes2;
-    int			maxCRT1_X1, maxCRT1_X2, maxCRT1_Y1, maxCRT1_Y2;
-    int			maxCRT2_X1, maxCRT2_X2, maxCRT2_Y1, maxCRT2_Y2;
-    int			maxClone_X1, maxClone_X2, maxClone_Y1, maxClone_Y2;
     int			MergedFBXDPI, MergedFBYDPI;
 #ifdef XGIXINERAMA
     Bool		UsexgiXinerama;
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index 6ca10b0..b530a77 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -2535,7 +2535,6 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
     /* Determine chipset and VGA engine type */
     pXGI->ChipFlags = 0;
     pXGI->XGI_SD_Flags = 0;
-    pXGI->HWCursorMBufNum = pXGI->HWCursorCBufNum = 0;
 
     switch(pXGI->Chipset) 
     {
diff --git a/src/xgi_opt.c b/src/xgi_opt.c
index bdefef2..fd55a18 100644
--- a/src/xgi_opt.c
+++ b/src/xgi_opt.c
@@ -285,8 +285,6 @@ xgiOptions(ScrnInfoPtr pScrn)
        pXGI->XvGammaRedDef = pXGI->XvGammaGreenDef = pXGI->XvGammaBlueDef = 1000;
     pXGI->GammaBriR = pXGI->GammaBriG = pXGI->GammaBriB = 1000;
     pXGI->GammaPBriR = pXGI->GammaPBriG = pXGI->GammaPBriB = 1000;
-    pXGI->HideHWCursor = FALSE;
-    pXGI->HWCursorIsVisible = FALSE;
 #ifdef XGIMERGED
     pXGI->MergedFB = pXGI->MergedFBAuto = FALSE;
     pXGI->CRT2Position = xgiRightOf;