diff --git a/src/i830.h b/src/i830.h index eca9396b..a07ba8ea 100644 --- a/src/i830.h +++ b/src/i830.h @@ -106,18 +106,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr; #define PIPE_DFP2 1<<6 #define PIPE_LFP2 1<<7 -typedef struct _VESARec { - /* SVGA state */ - pointer state, pstate; - int statePage, stateSize, stateMode, stateRefresh; - CARD32 *savedPal; - int savedScanlinePitch; - xf86MonPtr monitor; - /* display start */ - int x, y; -} VESARec, *VESAPtr; - - typedef struct _I830Rec *I830Ptr; typedef void (*I830WriteIndexedByteFunc)(I830Ptr pI830, IOADDRESS addr, @@ -480,7 +468,6 @@ typedef struct _I830Rec { /* Video BIOS support. */ vbeInfoPtr pVbe; - VESAPtr vesa; Bool swfSaved; CARD32 saveSWF0; diff --git a/src/i830_driver.c b/src/i830_driver.c index 7c151747..3612af76 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -352,7 +352,6 @@ I830GetRec(ScrnInfoPtr pScrn) if (pScrn->driverPrivate) return TRUE; pI830 = pScrn->driverPrivate = xnfcalloc(sizeof(I830Rec), 1); - pI830->vesa = xnfcalloc(sizeof(VESARec), 1); return TRUE; } @@ -360,7 +359,6 @@ static void I830FreeRec(ScrnInfoPtr pScrn) { I830Ptr pI830; - VESAPtr pVesa; if (!pScrn) return; @@ -374,11 +372,6 @@ I830FreeRec(ScrnInfoPtr pScrn) vbeFree(pI830->pVbe); } - pVesa = pI830->vesa; - if (pVesa->savedPal) - xfree(pVesa->savedPal); - xfree(pVesa); - xfree(pScrn->driverPrivate); pScrn->driverPrivate = NULL; }