Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
1  2 
drivers/char/drm/i915_drv.c
drivers/char/drm/i915_drv.h

index 6a6cc3c0c4c33bc8cb1c602327c1ddd8dc012dca,f0a0c5bd7c57b3665f617cbc03d2f85a97dacb01..1f59d3fc79bcdabcbf0715556c3010c5be60a1b3
@@@ -34,7 -34,7 +34,7 @@@
  
  #include "drm_pciids.h"
  
- int postinit( struct drm_device *dev, unsigned long flags )
static int postinit( struct drm_device *dev, unsigned long flags )
  {
        dev->counters += 4;
        dev->types[6] = _DRM_STAT_IRQ;
@@@ -97,9 -97,6 +97,9 @@@ static struct drm_driver driver = 
                .mmap = drm_mmap,
                .poll = drm_poll,
                .fasync = drm_fasync,
 +#ifdef CONFIG_COMPAT
 +              .compat_ioctl = i915_compat_ioctl,
 +#endif
        },
        .pci_driver = {
                .name          = DRIVER_NAME,
index 3a21223267cba29b3ff8b7d99280c37aebb917a5,68c329965ddffec34cce3b29ab077ce23843b84c..e58bdac16407befa5c3eb693052c566ee7aec3ec
@@@ -99,14 -99,6 +99,6 @@@ typedef struct drm_i915_private 
  } drm_i915_private_t;
  
                                /* i915_dma.c */
- extern int i915_dma_init(DRM_IOCTL_ARGS);
- extern int i915_dma_cleanup(drm_device_t * dev);
- extern int i915_flush_ioctl(DRM_IOCTL_ARGS);
- extern int i915_batchbuffer(DRM_IOCTL_ARGS);
- extern int i915_flip_bufs(DRM_IOCTL_ARGS);
- extern int i915_getparam(DRM_IOCTL_ARGS);
- extern int i915_setparam(DRM_IOCTL_ARGS);
- extern int i915_cmdbuffer(DRM_IOCTL_ARGS);
  extern void i915_kernel_lost_context(drm_device_t * dev);
  extern void i915_driver_pretakedown(drm_device_t *dev);
  extern void i915_driver_prerelease(drm_device_t *dev, DRMFILE filp);
  /* i915_irq.c */
  extern int i915_irq_emit(DRM_IOCTL_ARGS);
  extern int i915_irq_wait(DRM_IOCTL_ARGS);
- extern int i915_wait_irq(drm_device_t * dev, int irq_nr);
- extern int i915_emit_irq(drm_device_t * dev);
  
  extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
  extern void i915_driver_irq_preinstall(drm_device_t *dev);
@@@ -130,10 -120,6 +120,10 @@@ extern void i915_mem_takedown(struct me
  extern void i915_mem_release(drm_device_t * dev,
                             DRMFILE filp, struct mem_block *heap);
  
 +extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
 +                            unsigned long arg)
 +
 +
  #define I915_READ(reg)          DRM_READ32(dev_priv->mmio_map, reg)
  #define I915_WRITE(reg,val)     DRM_WRITE32(dev_priv->mmio_map, reg, val)
  #define I915_READ16(reg)      DRM_READ16(dev_priv->mmio_map, reg)