diff options
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r-- | drivers/char/drm/i915_drv.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index fa940d64b85d..9c37d2367dd5 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h | |||
@@ -99,14 +99,6 @@ typedef struct drm_i915_private { | |||
99 | } drm_i915_private_t; | 99 | } drm_i915_private_t; |
100 | 100 | ||
101 | /* i915_dma.c */ | 101 | /* i915_dma.c */ |
102 | extern int i915_dma_init(DRM_IOCTL_ARGS); | ||
103 | extern int i915_dma_cleanup(drm_device_t * dev); | ||
104 | extern int i915_flush_ioctl(DRM_IOCTL_ARGS); | ||
105 | extern int i915_batchbuffer(DRM_IOCTL_ARGS); | ||
106 | extern int i915_flip_bufs(DRM_IOCTL_ARGS); | ||
107 | extern int i915_getparam(DRM_IOCTL_ARGS); | ||
108 | extern int i915_setparam(DRM_IOCTL_ARGS); | ||
109 | extern int i915_cmdbuffer(DRM_IOCTL_ARGS); | ||
110 | extern void i915_kernel_lost_context(drm_device_t * dev); | 102 | extern void i915_kernel_lost_context(drm_device_t * dev); |
111 | extern void i915_driver_pretakedown(drm_device_t *dev); | 103 | extern void i915_driver_pretakedown(drm_device_t *dev); |
112 | extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp); | 104 | extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp); |
@@ -114,8 +106,6 @@ extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp); | |||
114 | /* i915_irq.c */ | 106 | /* i915_irq.c */ |
115 | extern int i915_irq_emit(DRM_IOCTL_ARGS); | 107 | extern int i915_irq_emit(DRM_IOCTL_ARGS); |
116 | extern int i915_irq_wait(DRM_IOCTL_ARGS); | 108 | extern int i915_irq_wait(DRM_IOCTL_ARGS); |
117 | extern int i915_wait_irq(drm_device_t * dev, int irq_nr); | ||
118 | extern int i915_emit_irq(drm_device_t * dev); | ||
119 | 109 | ||
120 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); | 110 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); |
121 | extern void i915_driver_irq_preinstall(drm_device_t *dev); | 111 | extern void i915_driver_irq_preinstall(drm_device_t *dev); |
@@ -130,6 +120,10 @@ extern void i915_mem_takedown(struct mem_block **heap); | |||
130 | extern void i915_mem_release(drm_device_t * dev, | 120 | extern void i915_mem_release(drm_device_t * dev, |
131 | DRMFILE filp, struct mem_block *heap); | 121 | DRMFILE filp, struct mem_block *heap); |
132 | 122 | ||
123 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, | ||
124 | unsigned long arg); | ||
125 | |||
126 | |||
133 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) | 127 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) |
134 | #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) | 128 | #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) |
135 | #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) | 129 | #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) |