diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h | 71 |
1 files changed, 47 insertions, 24 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..7fd8f77b5 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.57 2000/02/27 02:50:47 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.h,v 1.59 2000/06/17 00:03:19 martin Exp $ */ /* * MGA Millennium (MGA2064W) functions * @@ -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,7 +30,6 @@ #include "dri.h" #include "GL/glxint.h" #include "mga_dri.h" -#include "mga_dripriv.h" #endif #if !defined(EXTRADEBUG) @@ -60,6 +56,13 @@ void dbg_outreg32(ScrnInfoPtr,int,int); #define PORT_OFFSET (0x1F00 - 0x300) +#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 + typedef struct { unsigned char ExtVga[6]; unsigned char DacClk[6]; @@ -70,6 +73,18 @@ typedef struct { } MGARegRec, *MGARegPtr; typedef struct { + unsigned char brightness; + unsigned char contrast; + FBAreaPtr area; + RegionRec clip; + CARD32 colorKey; + CARD32 videoStatus; + Time offTime; + Time freeTime; + int lastPort; +} MGAPortPrivRec, *MGAPortPrivPtr; + +typedef struct { Bool isHwCursor; int CursorMaxWidth; int CursorMaxHeight; @@ -103,7 +118,6 @@ typedef struct { DisplayModePtr mode; } MGAFBLayout; - /* Card-specific driver information */ #define MGAPTR(p) ((MGAPtr)((p)->driverPrivate)) @@ -206,21 +220,29 @@ typedef struct { MGAFBLayout CurrentLayout; Bool DrawTransparent; int MaxBlitDWORDS; - + Bool TexturedVideo; + MGAPortPrivPtr portPrivate; + int numXAALines; #ifdef XF86DRI - Bool directRenderingEnabled; - DRIInfoPtr pDRIInfo; - int drmSubFD; - int numVisualConfigs; - __GLXvisualConfig* pVisualConfigs; - MGAConfigPrivPtr pVisualConfigsPriv; - MGARegRec DRContextRegs; - MGADRIServerPrivatePtr DRIServerInfo; + Bool have_quiescense; + Bool directRenderingEnabled; + DRIInfoPtr pDRIInfo; + int drmSubFD; + int numVisualConfigs; + __GLXvisualConfig* pVisualConfigs; + MGAConfigPrivPtr pVisualConfigsPriv; + MGARegRec DRContextRegs; + MGADRIServerPrivatePtr DRIServerInfo; #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 +262,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,14 +293,15 @@ 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); 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); - +void MGASelectBuffer(ScrnInfoPtr pScrn, int which); +Bool MgaCleanupDma(ScrnInfoPtr pScrn); +Bool MgaInitDma(ScrnInfoPtr pScrn, int prim_size); +#ifdef XF86DRI +Bool MgaLockUpdate(ScrnInfoPtr pScrn, drmLockFlags flags); +#endif void MGARefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void MGARefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox); void MGARefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox); |