diff options
| author | Dave Airlie <airlied@linux.ie> | 2003-08-13 23:35:40 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2003-08-13 23:35:40 +0000 |
| commit | 428cbe0b91b1b446b0878544f30121df9b5bb2ac (patch) | |
| tree | 7c3cb32bde568b451f312d5037278d1fb37a9f5d /linux-core/i810_drm.h | |
| parent | 03e6674c13f8e7033c891ae8979e7f996fe9a6c1 (diff) | |
DA: patch from Matthew upgraded to latest DRI head to solve issue with i810
compatibility
Diffstat (limited to 'linux-core/i810_drm.h')
| -rw-r--r-- | linux-core/i810_drm.h | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/linux-core/i810_drm.h b/linux-core/i810_drm.h index b35593bd..93775f68 100644 --- a/linux-core/i810_drm.h +++ b/linux-core/i810_drm.h @@ -94,12 +94,15 @@ #define I810_BACK 0x2 #define I810_DEPTH 0x4 +typedef enum _drm_i810_init_func { + I810_INIT_DMA = 0x01, + I810_CLEANUP_DMA = 0x02, + I810_INIT_DMA_1_4 = 0x03 + } drm_i810_init_func_t; +/* This is the init structure after v1.2 */ typedef struct _drm_i810_init { - enum { - I810_INIT_DMA = 0x01, - I810_CLEANUP_DMA = 0x02 - } func; + drm_i810_init_func_t func; #if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) int ring_map_idx; int buffer_map_idx; @@ -122,6 +125,29 @@ typedef struct _drm_i810_init { unsigned int pitch_bits; } drm_i810_init_t; +/* This is the init structure prior to v1.2 */ +typedef struct _drm_i810_pre12_init { + drm_i810_init_func_t func; +#if CONFIG_XFREE86_VERSION < XFREE86_VERSION(4,1,0,0) + int ring_map_idx; + int buffer_map_idx; +#else + unsigned int mmio_offset; + unsigned int buffers_offset; +#endif + int sarea_priv_offset; + unsigned int ring_start; + unsigned int ring_end; + unsigned int ring_size; + unsigned int front_offset; + unsigned int back_offset; + unsigned int depth_offset; + unsigned int w; + unsigned int h; + unsigned int pitch; + unsigned int pitch_bits; +} drm_i810_pre12_init_t; + /* Warning: If you change the SAREA structure you must change the Xserver * structure as well */ |