summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h79
1 files changed, 39 insertions, 40 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h
index 3078f1623..b10c74bfd 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_dri.h
@@ -43,7 +43,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#define R128_DEFAULT_CCE_PIO_MODE R128_PM4_64PIO_64VCBM_64INDBM
#define R128_DEFAULT_CCE_BM_MODE R128_PM4_64BM_64VCBM_64INDBM
#define R128_DEFAULT_AGP_MODE 2
-#define R128_DEFAULT_AGP_SIZE 8 /* MB (must be power of two, >= 4) */
+#define R128_DEFAULT_AGP_SIZE 8 /* MB (must be power of 2, >= 4MB) */
#define R128_DEFAULT_RING_SIZE 1 /* MB (must be page aligned) */
#define R128_DEFAULT_VB_SIZE 1 /* MB (must be page aligned) */
#define R128_DEFAULT_IND_SIZE 1 /* MB (must be page aligned) */
@@ -66,57 +66,56 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
typedef struct {
/* MMIO register data */
- drmHandle registerHandle;
- drmSize registerSize;
+ drmHandle registerHandle;
+ drmSize registerSize;
/* CCE ring buffer data */
- drmHandle ringHandle;
- drmSize ringMapSize;
- int ringSize;
+ drmHandle ringHandle;
+ drmSize ringMapSize;
+ int ringSize;
/* CCE ring read pointer data */
- drmHandle ringReadPtrHandle;
- drmSize ringReadMapSize;
+ drmHandle ringReadPtrHandle;
+ drmSize ringReadMapSize;
/* CCE vertex buffer data */
- drmHandle vbHandle;
- drmSize vbMapSize;
- int vbOffset;
- int vbBufSize;
+ drmHandle vbHandle;
+ drmSize vbMapSize;
+ int vbOffset;
+ int vbBufSize;
/* CCE indirect buffer data */
- drmHandle indHandle;
- drmSize indMapSize;
+ drmHandle indHandle;
+ drmSize indMapSize;
/* CCE AGP Texture data */
- drmHandle agpTexHandle;
- drmSize agpTexMapSize;
- int log2AGPTexGran;
- int agpTexOffset;
+ drmHandle agpTexHandle;
+ drmSize agpTexMapSize;
+ int log2AGPTexGran;
+ int agpTexOffset;
/* DRI screen private data */
- int deviceID; /* PCI device ID */
- int width; /* Width in pixels of display */
- int height; /* Height in scanlines of display */
- int depth; /* Depth of display (8, 15, 16, 24) */
- int bpp; /* Bit depth of display (8, 16, 24, 32) */
-
- int fbX; /* Start of frame buffer */
- int fbY;
- int backX; /* Start of shared back buffer */
- int backY;
- int depthX; /* Start of shared depth buffer */
- int depthY;
- int textureX; /* Start of texture data in frame buffer */
- int textureY;
- int textureSize;
- int log2TexGran;
-
- int chipset;
- int IsPCI; /* Current card is a PCI card */
-
- int CCEMode; /* CCE mode that server/clients use */
- int CCEFifoSize; /* Size of the CCE command FIFO */
+ int deviceID; /* PCI device ID */
+ int width; /* Width in pixels of display */
+ int height; /* Height in scanlines of display */
+ int depth; /* Depth of display (8, 15, 16, 24) */
+ int bpp; /* Bit depth of display (8, 16, 24, 32) */
+
+ int fbX; /* Start of frame buffer */
+ int fbY;
+ int backX; /* Start of shared back buffer */
+ int backY;
+ int depthX; /* Start of shared depth buffer */
+ int depthY;
+ int textureX; /* Start of texture data in frame buffer */
+ int textureY;
+ int textureSize;
+ int log2TexGran;
+
+ int IsPCI; /* Current card is a PCI card */
+
+ int CCEMode; /* CCE mode that server/clients use */
+ int CCEFifoSize; /* Size of the CCE command FIFO */
} R128DRIRec, *R128DRIPtr;
#endif