diff options
Diffstat (limited to 'drivers/char/drm/i830_drv.h')
-rw-r--r-- | drivers/char/drm/i830_drv.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h index e91f94afb4bb..bf2170318dd3 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/char/drm/i830_drv.h | |||
@@ -84,8 +84,8 @@ typedef struct _drm_i830_ring_buffer { | |||
84 | } drm_i830_ring_buffer_t; | 84 | } drm_i830_ring_buffer_t; |
85 | 85 | ||
86 | typedef struct drm_i830_private { | 86 | typedef struct drm_i830_private { |
87 | drm_map_t *sarea_map; | 87 | struct drm_map *sarea_map; |
88 | drm_map_t *mmio_map; | 88 | struct drm_map *mmio_map; |
89 | 89 | ||
90 | drm_i830_sarea_t *sarea_priv; | 90 | drm_i830_sarea_t *sarea_priv; |
91 | drm_i830_ring_buffer_t ring; | 91 | drm_i830_ring_buffer_t ring; |
@@ -132,16 +132,16 @@ extern int i830_irq_wait(struct inode *inode, struct file *filp, | |||
132 | unsigned int cmd, unsigned long arg); | 132 | unsigned int cmd, unsigned long arg); |
133 | 133 | ||
134 | extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); | 134 | extern irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS); |
135 | extern void i830_driver_irq_preinstall(drm_device_t * dev); | 135 | extern void i830_driver_irq_preinstall(struct drm_device * dev); |
136 | extern void i830_driver_irq_postinstall(drm_device_t * dev); | 136 | extern void i830_driver_irq_postinstall(struct drm_device * dev); |
137 | extern void i830_driver_irq_uninstall(drm_device_t * dev); | 137 | extern void i830_driver_irq_uninstall(struct drm_device * dev); |
138 | extern int i830_driver_load(struct drm_device *, unsigned long flags); | 138 | extern int i830_driver_load(struct drm_device *, unsigned long flags); |
139 | extern void i830_driver_preclose(drm_device_t * dev, DRMFILE filp); | 139 | extern void i830_driver_preclose(struct drm_device * dev, DRMFILE filp); |
140 | extern void i830_driver_lastclose(drm_device_t * dev); | 140 | extern void i830_driver_lastclose(struct drm_device * dev); |
141 | extern void i830_driver_reclaim_buffers_locked(drm_device_t * dev, | 141 | extern void i830_driver_reclaim_buffers_locked(struct drm_device * dev, |
142 | struct file *filp); | 142 | struct file *filp); |
143 | extern int i830_driver_dma_quiescent(drm_device_t * dev); | 143 | extern int i830_driver_dma_quiescent(struct drm_device * dev); |
144 | extern int i830_driver_device_is_agp(drm_device_t * dev); | 144 | extern int i830_driver_device_is_agp(struct drm_device * dev); |
145 | 145 | ||
146 | #define I830_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) | 146 | #define I830_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) |
147 | #define I830_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) | 147 | #define I830_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) |
@@ -180,7 +180,7 @@ extern int i830_driver_device_is_agp(drm_device_t * dev); | |||
180 | I830_WRITE(LP_RING + RING_TAIL, outring); \ | 180 | I830_WRITE(LP_RING + RING_TAIL, outring); \ |
181 | } while(0) | 181 | } while(0) |
182 | 182 | ||
183 | extern int i830_wait_ring(drm_device_t * dev, int n, const char *caller); | 183 | extern int i830_wait_ring(struct drm_device * dev, int n, const char *caller); |
184 | 184 | ||
185 | #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) | 185 | #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) |
186 | #define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) | 186 | #define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) |