diff options
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r-- | drivers/char/drm/i915_drv.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index 85e323acb95d..fd918565f4e5 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h | |||
@@ -120,11 +120,11 @@ extern drm_ioctl_desc_t i915_ioctls[]; | |||
120 | extern int i915_max_ioctl; | 120 | extern int i915_max_ioctl; |
121 | 121 | ||
122 | /* i915_dma.c */ | 122 | /* i915_dma.c */ |
123 | extern void i915_kernel_lost_context(drm_device_t * dev); | 123 | extern void i915_kernel_lost_context(struct drm_device * dev); |
124 | extern int i915_driver_load(struct drm_device *, unsigned long flags); | 124 | extern int i915_driver_load(struct drm_device *, unsigned long flags); |
125 | extern void i915_driver_lastclose(drm_device_t * dev); | 125 | extern void i915_driver_lastclose(struct drm_device * dev); |
126 | extern void i915_driver_preclose(drm_device_t * dev, DRMFILE filp); | 126 | extern void i915_driver_preclose(struct drm_device * dev, DRMFILE filp); |
127 | extern int i915_driver_device_is_agp(drm_device_t * dev); | 127 | extern int i915_driver_device_is_agp(struct drm_device * dev); |
128 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, | 128 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, |
129 | unsigned long arg); | 129 | unsigned long arg); |
130 | 130 | ||
@@ -132,12 +132,12 @@ extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, | |||
132 | extern int i915_irq_emit(DRM_IOCTL_ARGS); | 132 | extern int i915_irq_emit(DRM_IOCTL_ARGS); |
133 | extern int i915_irq_wait(DRM_IOCTL_ARGS); | 133 | extern int i915_irq_wait(DRM_IOCTL_ARGS); |
134 | 134 | ||
135 | extern int i915_driver_vblank_wait(drm_device_t *dev, unsigned int *sequence); | 135 | extern int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence); |
136 | extern int i915_driver_vblank_wait2(drm_device_t *dev, unsigned int *sequence); | 136 | extern int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence); |
137 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); | 137 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); |
138 | extern void i915_driver_irq_preinstall(drm_device_t * dev); | 138 | extern void i915_driver_irq_preinstall(struct drm_device * dev); |
139 | extern void i915_driver_irq_postinstall(drm_device_t * dev); | 139 | extern void i915_driver_irq_postinstall(struct drm_device * dev); |
140 | extern void i915_driver_irq_uninstall(drm_device_t * dev); | 140 | extern void i915_driver_irq_uninstall(struct drm_device * dev); |
141 | extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS); | 141 | extern int i915_vblank_pipe_set(DRM_IOCTL_ARGS); |
142 | extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS); | 142 | extern int i915_vblank_pipe_get(DRM_IOCTL_ARGS); |
143 | extern int i915_vblank_swap(DRM_IOCTL_ARGS); | 143 | extern int i915_vblank_swap(DRM_IOCTL_ARGS); |
@@ -148,7 +148,7 @@ extern int i915_mem_free(DRM_IOCTL_ARGS); | |||
148 | extern int i915_mem_init_heap(DRM_IOCTL_ARGS); | 148 | extern int i915_mem_init_heap(DRM_IOCTL_ARGS); |
149 | extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS); | 149 | extern int i915_mem_destroy_heap(DRM_IOCTL_ARGS); |
150 | extern void i915_mem_takedown(struct mem_block **heap); | 150 | extern void i915_mem_takedown(struct mem_block **heap); |
151 | extern void i915_mem_release(drm_device_t * dev, | 151 | extern void i915_mem_release(struct drm_device * dev, |
152 | DRMFILE filp, struct mem_block *heap); | 152 | DRMFILE filp, struct mem_block *heap); |
153 | 153 | ||
154 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg)) | 154 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, (reg)) |
@@ -188,7 +188,7 @@ extern void i915_mem_release(drm_device_t * dev, | |||
188 | I915_WRITE(LP_RING + RING_TAIL, outring); \ | 188 | I915_WRITE(LP_RING + RING_TAIL, outring); \ |
189 | } while(0) | 189 | } while(0) |
190 | 190 | ||
191 | extern int i915_wait_ring(drm_device_t * dev, int n, const char *caller); | 191 | extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); |
192 | 192 | ||
193 | #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) | 193 | #define GFX_OP_USER_INTERRUPT ((0<<29)|(2<<23)) |
194 | #define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) | 194 | #define GFX_OP_BREAKPOINT_INTERRUPT ((0<<29)|(1<<23)) |