diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h index e948cb6b9..91676f19f 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h,v 1.8 2000/02/23 04:47:18 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/r128/r128.h,v 1.10 2000/06/17 00:03:22 martin Exp $ */ /************************************************************************** Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., @@ -159,6 +159,15 @@ typedef struct { } R128PLLRec, *R128PLLPtr; typedef struct { + int bitsPerPixel; + int depth; + int displayWidth; + int pixel_code; + int pixel_bytes; + DisplayModePtr mode; +} R128FBLayout; + +typedef struct { EntityInfoPtr pEnt; pciVideoPtr PciInfo; PCITAG PciTag; @@ -210,8 +219,6 @@ typedef struct { int fifo_slots; /* Free slots in the FIFO (64 max) */ int pix24bpp; /* Depth of pixmap for 24bpp framebuffer */ - int pixel_code; /* Unified depth/fbbpp value */ - int pixel_bytes;/* Bytes per framebuffer pixel */ Bool dac6bits; /* Use 6 bit DAC? */ /* Computed values for Rage 128 */ @@ -234,6 +241,12 @@ typedef struct { int scanline_direct; int scanline_bpp; /* Only used for ImageWrite */ + DGAModePtr DGAModes; + int numDGAModes; + Bool DGAactive; + int DGAViewportStatus; + + R128FBLayout CurrentLayout; #ifdef XF86DRI Bool directRenderingEnabled; DRIInfoPtr pDRIInfo; @@ -241,14 +254,14 @@ typedef struct { int numVisualConfigs; __GLXvisualConfig *pVisualConfigs; R128ConfigPrivPtr pVisualConfigsPriv; - + drmHandle fbHandle; - + drmSize registerSize; drmHandle registerHandle; Bool IsPCI; /* Current card is a PCI card */ - + drmSize agpSize; drmHandle agpMemHandle; /* Handle from drmAgpAlloc */ unsigned long agpOffset; @@ -327,10 +340,13 @@ extern void R128EngineFlush(ScrnInfoPtr pScrn); extern int INPLL(ScrnInfoPtr pScrn, int addr); extern void R128WaitForVerticalSync(ScrnInfoPtr pScrn); +extern void R128AdjustFrame(int scrnIndex, int x, int y, int flags); +extern Bool R128SwitchMode(int ScrnIndex, DisplayModePtr mode, int flags); extern Bool R128AccelInit(ScreenPtr pScreen); extern void R128EngineInit(ScrnInfoPtr pScrn); extern Bool R128CursorInit(ScreenPtr pScreen); +extern Bool R128DGAInit(ScreenPtr pScreen); extern int R128MinBits(int val); |