diff options
| author | Kevin E Martin <kem@kem.org> | 2001-03-14 22:22:50 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2001-03-14 22:22:50 +0000 |
| commit | 74e19a40187ac3b5907922e5dc01418135a5794b (patch) | |
| tree | 6623cfe435730e28c25829ebc6931e46871b81ce /linux/i810_drv.h | |
| parent | e2b2bffc6b25361b2f09afc5a28030645440cd03 (diff) | |
Merged sarea-1-0-0sarea-1-0-0-20010314-mergefull-1-0-0-20010315-head
Diffstat (limited to 'linux/i810_drv.h')
| -rw-r--r-- | linux/i810_drv.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/i810_drv.h b/linux/i810_drv.h index 43d44e02..e1b17148 100644 --- a/linux/i810_drv.h +++ b/linux/i810_drv.h @@ -54,11 +54,12 @@ typedef struct _drm_i810_ring_buffer{ } drm_i810_ring_buffer_t; typedef struct drm_i810_private { - int ring_map_idx; - int buffer_map_idx; + drm_map_t *sarea_map; + drm_map_t *buffer_map; + drm_map_t *mmio_map; - drm_i810_ring_buffer_t ring; drm_i810_sarea_t *sarea_priv; + drm_i810_ring_buffer_t ring; unsigned long hw_status_page; unsigned long counter; @@ -108,9 +109,8 @@ int i810_clear_bufs(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); -#define I810_REG(reg) 2 #define I810_BASE(reg) ((unsigned long) \ - dev->maplist[I810_REG(reg)]->handle) + dev_priv->mmio_map->handle) #define I810_ADDR(reg) (I810_BASE(reg) + reg) #define I810_DEREF(reg) *(__volatile__ int *)I810_ADDR(reg) #define I810_READ(reg) I810_DEREF(reg) |