Eliminiate useless currentLayout field.

2 files changed, 0 insertions, 36 deletions

diff --git a/src/xgi.h b/src/xgi.h
index 4c1d2a8..e289b26 100644
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -526,7 +526,6 @@ typedef struct {
     int                 minClock;
     int                 maxClock;
 
-    XGIFBLayout         currentLayout;
     XGIDigitalTVInfoPtr pDtvInfo;
 
     Bool                lcdActive;
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index e631961..017e08d 100644
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -946,10 +946,6 @@ static Bool XGIPreInitVisual(ScrnInfoPtr pScrn)
     /* Get pixmap format */
     pXGI->pix24bpp = xf86GetBppFromDepth(pScrn, pScrn->depth);
 
-    pXGI->currentLayout.bitsPerPixel = pScrn->bitsPerPixel;
-    pXGI->currentLayout.depth        = pScrn->depth;
-    pXGI->currentLayout.bytesPerPixel= pScrn->bitsPerPixel/8;
-
     /* Set the default visual. */
     if (!xf86SetDefaultVisual(pScrn, -1))   return FALSE;
 
@@ -1331,9 +1327,6 @@ static Bool XGIPreInitModes(ScrnInfoPtr pScrn)
     if (mod && !xf86LoadSubModule(pScrn, mod)) return FALSE;
     xf86LoaderReqSymLists(fbSymbols, NULL);
 
-    pXGI->currentLayout.displayWidth = pScrn->displayWidth;
-    pXGI->currentLayout.mode = pScrn->currentMode;
-
 #if DBG_FLOW
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "-- Leave %s() %s:%d\n", __FUNCTION__, __FILE__, __LINE__);
 #endif
@@ -1935,31 +1928,6 @@ static void XGIRestore(ScrnInfoPtr pScrn)
 
 }
 
-Bool XGIPutScreenInfo(ScrnInfoPtr pScrn)
-{
-#if 0
-    XGIPtr              pXGI = XGIPTR(pScrn);
-    struct xgi_screen_info    scrnInfo;
-    int                 ret;
-
-    scrnInfo.scrn_start = 0;
-    scrnInfo.scrn_xres  = pXGI->currentLayout.mode->HDisplay;
-    scrnInfo.scrn_yres  = pXGI->currentLayout.mode->VDisplay;
-    scrnInfo.scrn_bpp   = pScrn->bitsPerPixel >> 3;
-    scrnInfo.scrn_pitch = scrnInfo.scrn_xres * scrnInfo.scrn_bpp;
-
-    ret = ioctl(pXGI->fd, XGI_IOCTL_PUT_SCREEN_INFO, &scrnInfo);
-
-    if (ret < 0)
-    {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "failed to get screen info !\n");
-        return FALSE;
-    }
-#endif
-
-    return TRUE;
-}
-
 Bool XGIFBManagerInit(ScreenPtr pScreen)
 {
     ScrnInfoPtr     pScrn = xf86Screens[pScreen->myNum];
@@ -2219,7 +2187,6 @@ Bool XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	}
     }
 
-    XGIPutScreenInfo(pScrn);
     /* 2D accel Initialize */
     if (!pXGI->noAccel) {
         pXGI->noAccel = !XG47AccelInit(pScreen);
@@ -2842,8 +2809,6 @@ static Bool XGIModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
         break;
     }
 
-    pXGI->currentLayout.mode = mode;
-
 #ifdef XGI_DUMP
     XGIDumpRegisterValue(pScrn);
 #endif