aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_drv.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
-rw-r--r--drivers/char/drm/i915_drv.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 70ed4e68eac8..511ef1d87637 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -101,18 +101,18 @@ typedef struct drm_i915_private {
101 101
102 /* i915_dma.c */ 102 /* i915_dma.c */
103extern void i915_kernel_lost_context(drm_device_t * dev); 103extern void i915_kernel_lost_context(drm_device_t * dev);
104extern void i915_driver_pretakedown(drm_device_t *dev); 104extern void i915_driver_pretakedown(drm_device_t * dev);
105extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp); 105extern void i915_driver_prerelease(drm_device_t * dev, DRMFILE filp);
106extern int i915_driver_device_is_agp(drm_device_t *dev); 106extern int i915_driver_device_is_agp(drm_device_t * dev);
107 107
108/* i915_irq.c */ 108/* i915_irq.c */
109extern int i915_irq_emit(DRM_IOCTL_ARGS); 109extern int i915_irq_emit(DRM_IOCTL_ARGS);
110extern int i915_irq_wait(DRM_IOCTL_ARGS); 110extern int i915_irq_wait(DRM_IOCTL_ARGS);
111 111
112extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS); 112extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
113extern void i915_driver_irq_preinstall(drm_device_t *dev); 113extern void i915_driver_irq_preinstall(drm_device_t * dev);
114extern void i915_driver_irq_postinstall(drm_device_t *dev); 114extern void i915_driver_irq_postinstall(drm_device_t * dev);
115extern void i915_driver_irq_uninstall(drm_device_t *dev); 115extern void i915_driver_irq_uninstall(drm_device_t * dev);
116 116
117/* i915_mem.c */ 117/* i915_mem.c */
118extern int i915_mem_alloc(DRM_IOCTL_ARGS); 118extern int i915_mem_alloc(DRM_IOCTL_ARGS);
@@ -125,7 +125,6 @@ extern void i915_mem_release(drm_device_t * dev,
125extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, 125extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
126 unsigned long arg); 126 unsigned long arg);
127 127
128
129#define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) 128#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) 129#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) 130#define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg)