3 files changed, 29 insertions, 25 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
index 5cfefa728..f6c346438 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c
@@ -352,6 +352,9 @@ static const char *driSymbols[] = {
     "DRIGetSAREAPrivate",
     "DRIGetContext",
     "DRIQueryVersion",
+    "DRIAdjustFrame",
+    "DRIOpenFullScreen",
+    "DRICloseFullScreen",
     "GlxSetVisualConfigs",
     NULL
 };
@@ -3029,6 +3032,16 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     xf86DPMSInit(pScreen, MGADisplayPowerManagementSet, 0);
 #endif
    
+    pScrn->memPhysBase = pMga->FbAddress;
+    pScrn->fbOffset = pMga->YDstOrg * (pScrn->bitsPerPixel / 8);
+
+    if(pMga->SecondCrtc == TRUE) {
+	pScreen->SaveScreen = MGASaveScreenCrtc2;
+    } else {
+	pScreen->SaveScreen = MGASaveScreen;
+    }
+    MGAInitVideo(pScreen);
+
 #ifdef XF86DRI
     /* Initialize the Warp engine */
     if (pMga->directRenderingEnabled) {
@@ -3050,16 +3063,6 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     pMga->have_quiescense = 1;
 #endif
      
-    pScrn->memPhysBase = pMga->FbAddress;
-    pScrn->fbOffset = pMga->YDstOrg * (pScrn->bitsPerPixel / 8);
-
-    if(pMga->SecondCrtc == TRUE) {
-	pScreen->SaveScreen = MGASaveScreenCrtc2;
-    } else {
-	pScreen->SaveScreen = MGASaveScreen;
-    }
-    MGAInitVideo(pScreen);
-
     /* Wrap the current CloseScreen function */
     pMga->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = MGACloseScreen;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index c64e0d049..39bedb922 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -373,6 +373,8 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
   pDRIInfo->SwapContext = TDFXDRISwapContext;
   pDRIInfo->InitBuffers = TDFXDRIInitBuffers;
   pDRIInfo->MoveBuffers = TDFXDRIMoveBuffers;
+  pDRIInfo->OpenFullScreen = TDFXDRIOpenFullScreen;
+  pDRIInfo->CloseFullScreen = TDFXDRICloseFullScreen;
   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
 
   if (!DRIScreenInit(pScreen, pDRIInfo, &pTDFX->drmSubFD)) {
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
index 201a2ff6f..5c2c355f5 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
@@ -206,6 +206,20 @@ static const char *vgahwSymbols[] = {
     0
 };
 
+static const char *ramdacSymbols[] = {
+    "xf86InitCursor",
+    "xf86CreateCursorInfoRec",
+    "xf86DestroyCursorInfoRec",
+    NULL
+};
+
+static const char *ddcSymbols[] = {
+    "xf86PrintEDID",
+    "xf86DoEDID_DDC1",
+    NULL
+};
+
+#ifdef XFree86LOADER
 static const char *fbSymbols[] = {
     "fbScreenInit",
 #ifdef RENDER
@@ -231,19 +245,6 @@ static const char *xaaSymbols[] = {
     NULL
 };
 
-static const char *ramdacSymbols[] = {
-    "xf86InitCursor",
-    "xf86CreateCursorInfoRec",
-    "xf86DestroyCursorInfoRec",
-    NULL
-};
-
-static const char *ddcSymbols[] = {
-    "xf86PrintEDID",
-    "xf86DoEDID_DDC1",
-    NULL
-};
-
 static const char *vbeSymbols[] = {
     "VBEInit",
     "vbeDoEDID",
@@ -289,8 +290,6 @@ static const char *driSymbols[] = {
 
 #endif
 
-#ifdef XFree86LOADER
-
 static MODULESETUPPROTO(tdfxSetup);
 
 static XF86ModuleVersionInfo tdfxVersRec =