From 3ef757f055a16689fdea95a0e7561403af3e42fe Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Wed, 2 May 2007 15:19:53 -0700
Subject: [PATCH] Eliminiate need for XGI_VGAINFO structure field, remove
 field.

---
 src/init.c    | 10 +++++-----
 src/vstruct.h |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/init.c b/src/init.c
index 185d82a..0e4d164 100644
--- a/src/init.c
+++ b/src/init.c
@@ -1156,6 +1156,7 @@ XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,
    XGIIOADDRESS BaseAddr = HwInfo->pjIOAddress;
    USHORT  ModeIdIndex, ModeNo=0;
    UCHAR backupreg=0;
+    unsigned vga_info;
 #ifdef XGIDUALHEAD
    XGIEntPtr pXGIEnt = pXGI->entityPrivate;
    UCHAR backupcr30, backupcr31, backupcr38, backupcr35, backupp40d=0;
@@ -1172,17 +1173,16 @@ XGIBIOSSetModeCRT1(XGI_Private *XGI_Pr, PXGI_HW_DEVICE_INFO HwInfo,
 
    XGIRegInit(XGI_Pr, BaseAddr);
 #if (defined(i386) || defined(__i386) || defined(__i386__) || defined(__AMD64__))
-   XGI_Pr->XGI_VGAINFO = XGI_GetSetBIOSScratch(pScrn, 0x489, 0xff);
+    vga_info = XGI_GetSetBIOSScratch(pScrn, 0x489, 0xff);
 #else
-   XGI_Pr->XGI_VGAINFO = 0x11;
+    vga_info = 0x11;
 #endif
    XGIInitPCIetc(XGI_Pr, HwInfo);
 
    XGI_SetReg(XGI_Pr->XGI_P3c4,0x05,0x86);
 
-   if (!XGI_SearchModeID(XGI_Pr->XGI_SModeIDTable,
-			 XGI_Pr->XGI_EModeIDTable,
-			 XGI_Pr->XGI_VGAINFO, &ModeNo, &ModeIdIndex)) {
+   if (!XGI_SearchModeID(XGI_Pr->XGI_SModeIDTable, XGI_Pr->XGI_EModeIDTable,
+                         vga_info, &ModeNo, &ModeIdIndex)) {
        return FALSE;
    }
 
diff --git a/src/vstruct.h b/src/vstruct.h
index 79f4a2d..01e1048 100644
--- a/src/vstruct.h
+++ b/src/vstruct.h
@@ -93,8 +93,6 @@ typedef struct _XGI_Private
     /* FIXME: This field is tested but is never set. */
 	USHORT XGI_IF_DEF_CONEX;
 
-	UCHAR  XGI_VGAINFO;
-
     /* FIXME: These 9 fields are set but never used. */
 	BOOLEAN PanelSelfDetected;
 	int     XGI_UseOEM;