diff options
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r-- | drivers/char/drm/i915_drv.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index 70ed4e68eac8..17e457c73dc7 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h | |||
@@ -99,20 +99,23 @@ typedef struct drm_i915_private { | |||
99 | struct mem_block *agp_heap; | 99 | struct mem_block *agp_heap; |
100 | } drm_i915_private_t; | 100 | } drm_i915_private_t; |
101 | 101 | ||
102 | extern drm_ioctl_desc_t i915_ioctls[]; | ||
103 | extern int i915_max_ioctl; | ||
104 | |||
102 | /* i915_dma.c */ | 105 | /* i915_dma.c */ |
103 | extern void i915_kernel_lost_context(drm_device_t * dev); | 106 | extern void i915_kernel_lost_context(drm_device_t * dev); |
104 | extern void i915_driver_pretakedown(drm_device_t *dev); | 107 | extern void i915_driver_pretakedown(drm_device_t * dev); |
105 | extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp); | 108 | extern void i915_driver_prerelease(drm_device_t * dev, DRMFILE filp); |
106 | extern int i915_driver_device_is_agp(drm_device_t *dev); | 109 | extern int i915_driver_device_is_agp(drm_device_t * dev); |
107 | 110 | ||
108 | /* i915_irq.c */ | 111 | /* i915_irq.c */ |
109 | extern int i915_irq_emit(DRM_IOCTL_ARGS); | 112 | extern int i915_irq_emit(DRM_IOCTL_ARGS); |
110 | extern int i915_irq_wait(DRM_IOCTL_ARGS); | 113 | extern int i915_irq_wait(DRM_IOCTL_ARGS); |
111 | 114 | ||
112 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); | 115 | extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); |
113 | extern void i915_driver_irq_preinstall(drm_device_t *dev); | 116 | extern void i915_driver_irq_preinstall(drm_device_t * dev); |
114 | extern void i915_driver_irq_postinstall(drm_device_t *dev); | 117 | extern void i915_driver_irq_postinstall(drm_device_t * dev); |
115 | extern void i915_driver_irq_uninstall(drm_device_t *dev); | 118 | extern void i915_driver_irq_uninstall(drm_device_t * dev); |
116 | 119 | ||
117 | /* i915_mem.c */ | 120 | /* i915_mem.c */ |
118 | extern int i915_mem_alloc(DRM_IOCTL_ARGS); | 121 | extern int i915_mem_alloc(DRM_IOCTL_ARGS); |
@@ -125,7 +128,6 @@ extern void i915_mem_release(drm_device_t * dev, | |||
125 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, | 128 | extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, |
126 | unsigned long arg); | 129 | unsigned long arg); |
127 | 130 | ||
128 | |||
129 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) | 131 | #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) |
130 | #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) | 132 | #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) |
131 | #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) | 133 | #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) |