summaryrefslogtreecommitdiff
path: root/driver/xf86-video-intel/src/i830_dri.h
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2010-05-10 22:32:31 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2010-05-10 22:32:31 +0000
commit874c3f202a3a8633ba9af4ae0920c6e4b419085d (patch)
treea8a85f244568acbdb79508a538ee73b0451fa718 /driver/xf86-video-intel/src/i830_dri.h
parentb3e95d7d69646862364768b6a4aa6ed0b54e17ff (diff)
Update the intel driver to 2.9.1 plus backports.
2.9.1 is the last version of the intel DDX that supports UMS (User modesetting), with 2.10 onwards being purely KMS only. As such, this driver contains backports of almost every correctness or performance related fix to the rendering layer in later intel drivers. This driver *REQUIRES* a GEM enabled kernel. it claims to support non-gem mode but this is essentially unmaintained and due to the way the abstraciton works is slow, if it works at all (it often does not). You have been warned. tested by many many people on tech over the last few weeks.
Diffstat (limited to 'driver/xf86-video-intel/src/i830_dri.h')
-rw-r--r--driver/xf86-video-intel/src/i830_dri.h55
1 files changed, 27 insertions, 28 deletions
diff --git a/driver/xf86-video-intel/src/i830_dri.h b/driver/xf86-video-intel/src/i830_dri.h
index 83ddd8572..9802356ce 100644
--- a/driver/xf86-video-intel/src/i830_dri.h
+++ b/driver/xf86-video-intel/src/i830_dri.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h,v 1.6 2003/09/28 20:15:59 alanh Exp $ */
#ifndef _I830_DRI_H
#define _I830_DRI_H
@@ -15,48 +14,48 @@
#define I830_REG_SIZE 0x80000
typedef struct _I830DRIRec {
- drm_handle_t regs;
- drmSize regsSize;
+ drm_handle_t regs;
+ drmSize regsSize;
- drmSize unused1; /* backbufferSize */
- drm_handle_t unused2; /* backbuffer */
+ drmSize unused1; /* backbufferSize */
+ drm_handle_t unused2; /* backbuffer */
- drmSize unused3; /* depthbufferSize */
- drm_handle_t unused4; /* depthbuffer */
+ drmSize unused3; /* depthbufferSize */
+ drm_handle_t unused4; /* depthbuffer */
- drmSize unused5; /* rotatedSize /*/
- drm_handle_t unused6; /* rotatedbuffer */
+ drmSize unused5; /* rotatedSize / */
+ drm_handle_t unused6; /* rotatedbuffer */
- drm_handle_t unused7; /* textures */
- int unused8; /* textureSize */
+ drm_handle_t unused7; /* textures */
+ int unused8; /* textureSize */
- drm_handle_t unused9; /* agp_buffers */
- drmSize unused10; /* agp_buf_size */
+ drm_handle_t unused9; /* agp_buffers */
+ drmSize unused10; /* agp_buf_size */
- int deviceID;
- int width;
- int height;
- int mem;
- int cpp;
- int bitsPerPixel;
+ int deviceID;
+ int width;
+ int height;
+ int mem;
+ int cpp;
+ int bitsPerPixel;
- int unused11[8]; /* was front/back/depth/rotated offset/pitch */
+ int unused11[8]; /* was front/back/depth/rotated offset/pitch */
- int unused12; /* logTextureGranularity */
- int unused13; /* textureOffset */
+ int unused12; /* logTextureGranularity */
+ int unused13; /* textureOffset */
- int irq;
- int sarea_priv_offset;
+ int irq;
+ int sarea_priv_offset;
} I830DRIRec, *I830DRIPtr;
typedef struct {
- /* Nothing here yet */
- int dummy;
+ /* Nothing here yet */
+ int dummy;
} I830ConfigPrivRec, *I830ConfigPrivPtr;
typedef struct {
- /* Nothing here yet */
- int dummy;
+ /* Nothing here yet */
+ int dummy;
} I830DRIContextRec, *I830DRIContextPtr;
#endif