Merge the latest version of the trunk into my tdfx-2-0 branch.tdfx-2-0-20000608-merge

1 files changed, 24 insertions, 11 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
index 2027171da..931e4a19d 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h
@@ -14,9 +14,6 @@
 #ifndef MGA_H
 #define MGA_H
 
-/* Temporarily turn off building in DRI support */
-#undef XF86DRI
-
 #include "compiler.h"
 #include "xaa.h"
 #include "xf86Cursor.h"
@@ -33,9 +30,15 @@
 #include "dri.h"
 #include "GL/glxint.h"
 #include "mga_dri.h"
-#include "mga_dripriv.h"
 #endif
 
+#define MGA_VERSION 4000
+#define MGA_NAME "MGA"
+#define MGA_DRIVER_NAME "mga"
+#define MGA_MAJOR_VERSION 1
+#define MGA_MINOR_VERSION 0
+#define MGA_PATCHLEVEL 0
+
 #if !defined(EXTRADEBUG)
 #define INREG8(addr) MMIO_IN8(pMga->IOBase, addr)
 #define INREG16(addr) MMIO_IN16(pMga->IOBase, addr)
@@ -69,6 +72,7 @@ typedef struct {
     CARD32		Option3;
 } MGARegRec, *MGARegPtr;
 
+
 typedef struct {
     Bool	isHwCursor;
     int		CursorMaxWidth;
@@ -216,11 +220,20 @@ typedef struct {
    MGAConfigPrivPtr pVisualConfigsPriv;
    MGARegRec DRContextRegs;
    MGADRIServerPrivatePtr  DRIServerInfo;
+   Bool have_quiescense;
 #endif
 
     XF86VideoAdaptorPtr adaptor;
 } MGARec, *MGAPtr;
 
+#ifdef XF86DRI
+extern void GlxSetVisualConfigs(
+    int nconfigs,
+    __GLXvisualConfig *configs,
+    void **configprivs
+);
+#endif
+
 extern CARD32 MGAAtype[16];
 extern CARD32 MGAAtypeNoBLK[16];
 
@@ -240,9 +253,9 @@ extern CARD32 MGAAtypeNoBLK[16];
 #define TRANSPARENCY_KEY	255
 #define KEY_COLOR		0
 
-#define MGA_FRONT	0
-#define MGA_BACK	1
-#define MGA_DEPTH	2
+#define MGA_FRONT	0x1
+#define MGA_BACK	0x2
+#define MGA_DEPTH	0x4
 
 
 /* Prototypes */
@@ -271,13 +284,13 @@ Bool MGADRIScreenInit(ScreenPtr pScreen);
 void MGADRICloseScreen(ScreenPtr pScreen);
 Bool MGADRIFinishScreenInit(ScreenPtr pScreen);
 void MGASwapContext(ScreenPtr pScreen);
-void MGALostContext(ScreenPtr pScreen);
-void MGASelectBuffer(MGAPtr pMGA, int which);
+void MGASelectBuffer(ScrnInfoPtr pScrn, int which);
 Bool mgaConfigureWarp(ScrnInfoPtr pScrn);
 unsigned int mgaInstallMicrocode(ScreenPtr pScreen, int agp_offset);
 unsigned int mgaGetMicrocodeSize(ScreenPtr pScreen);
-Bool mgadrmCleanupDma(ScrnInfoPtr pScrn);
-Bool mgadrmInitDma(ScrnInfoPtr pScrn, int prim_size);
+Bool MgaCleanupDma(ScrnInfoPtr pScrn);
+Bool MgaInitDma(ScrnInfoPtr pScrn, int prim_size);
+Bool MgaLockUpdate(ScrnInfoPtr pScrn, drmLockFlags flags);
 
 void MGARefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
 void MGARefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);