vserver 1.9.3

[linux-2.6.git] / drivers / char / drm / i810_dma.c

diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index 84823f6..d9348ac 100644 (file)
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -171,7 +171,7 @@ static int i810_map_buffer(drm_buf_t *buf, struct file *filp)
                /* Real error */
                DRM_ERROR("mmap error\n");
                retcode = (signed int)buf_priv->virtual;
-               buf_priv->virtual = 0;
+               buf_priv->virtual = NULL;
        }
        up_write( &current->mm->mmap_sem );
 
@@ -193,7 +193,7 @@ static int i810_unmap_buffer(drm_buf_t *buf)
        up_write(&current->mm->mmap_sem);
 
        buf_priv->currently_mapped = I810_BUF_UNMAPPED;
-       buf_priv->virtual = 0;
+       buf_priv->virtual = NULL;
 
        return retcode;
 }
@@ -232,13 +232,12 @@ int i810_dma_cleanup(drm_device_t *dev)
 {
        drm_device_dma_t *dma = dev->dma;
 
-#if __HAVE_IRQ
        /* Make sure interrupts are disabled here because the uninstall ioctl
         * may not have been called from userspace and after dev_private
         * is freed, it's too late.
         */
-       if ( dev->irq_enabled ) DRM(irq_uninstall)(dev);
-#endif
+       if (drm_core_check_feature(dev, DRIVER_HAVE_IRQ) && dev->irq_enabled)
+               DRM(irq_uninstall)(dev);
 
        if (dev->dev_private) {
                int i;
@@ -364,15 +363,15 @@ static int i810_dma_initialize(drm_device_t *dev,
                DRM_ERROR("can not find sarea!\n");
                return -EINVAL;
        }
-       DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset );
+       dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
        if (!dev_priv->mmio_map) {
                dev->dev_private = (void *)dev_priv;
                i810_dma_cleanup(dev);
                DRM_ERROR("can not find mmio map!\n");
                return -EINVAL;
        }
-       DRM_FIND_MAP( dev_priv->buffer_map, init->buffers_offset );
-       if (!dev_priv->buffer_map) {
+       dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
+       if (!dev->agp_buffer_map) {
                dev->dev_private = (void *)dev_priv;
                i810_dma_cleanup(dev);
                DRM_ERROR("can not find dma buffer map!\n");
@@ -459,7 +458,7 @@ int i810_dma_init_compat(drm_i810_init_t *init, unsigned long arg)
 {
 
        /* Get v1.1 init data */
-       if (copy_from_user(init, (drm_i810_pre12_init_t *)arg,
+       if (copy_from_user(init, (drm_i810_pre12_init_t __user *)arg,
                          sizeof(drm_i810_pre12_init_t))) {
                return -EFAULT;
        }
@@ -468,7 +467,7 @@ int i810_dma_init_compat(drm_i810_init_t *init, unsigned long arg)
 
                /* This is a v1.2 client, just get the v1.2 init data */
                DRM_INFO("Using POST v1.2 init.\n");
-               if (copy_from_user(init, (drm_i810_init_t *)arg,
+               if (copy_from_user(init, (drm_i810_init_t __user *)arg,
                                   sizeof(drm_i810_init_t))) {
                        return -EFAULT;
                }
@@ -497,7 +496,7 @@ int i810_dma_init(struct inode *inode, struct file *filp,
        int retcode = 0;
 
        /* Get only the init func */
-       if (copy_from_user(&init, (void *)arg, sizeof(drm_i810_init_func_t))) 
+       if (copy_from_user(&init, (void __user *)arg, sizeof(drm_i810_init_func_t))) 
                return -EFAULT;
 
        switch(init.func) {
@@ -521,7 +520,7 @@ int i810_dma_init(struct inode *inode, struct file *filp,
                default:
                case I810_INIT_DMA_1_4:
                        DRM_INFO("Using v1.4 init.\n");
-                       if (copy_from_user(&init, (drm_i810_init_t *)arg,
+                       if (copy_from_user(&init, (drm_i810_init_t __user *)arg,
                                          sizeof(drm_i810_init_t))) {
                                return -EFAULT;
                        }
@@ -844,13 +843,10 @@ static void i810_dma_dispatch_vertex(drm_device_t *dev,
        if (buf_priv->currently_mapped == I810_BUF_MAPPED) {
                unsigned int prim = (sarea_priv->vertex_prim & PR_MASK);
 
-               put_user((GFX_OP_PRIMITIVE | prim |
-                                            ((used/4)-2)),
-               (u32 *)buf_priv->virtual);
+               *(u32 *)buf_priv->kernel_virtual = ((GFX_OP_PRIMITIVE | prim | ((used/4)-2)));
 
                if (used & 4) {
-                       put_user(0,
-                       (u32 *)((u32)buf_priv->virtual + used));
+                       *(u32 *)((u32)buf_priv->kernel_virtual + used) = 0;
                        used += 4;
                }
 
@@ -1056,7 +1052,7 @@ int i810_dma_vertex(struct inode *inode, struct file *filp,
                                        dev_priv->sarea_priv;
        drm_i810_vertex_t vertex;
 
-       if (copy_from_user(&vertex, (drm_i810_vertex_t *)arg, sizeof(vertex)))
+       if (copy_from_user(&vertex, (drm_i810_vertex_t __user *)arg, sizeof(vertex)))
                return -EFAULT;
 
        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
@@ -1091,7 +1087,7 @@ int i810_clear_bufs(struct inode *inode, struct file *filp,
        drm_device_t *dev = priv->dev;
        drm_i810_clear_t clear;
 
-       if (copy_from_user(&clear, (drm_i810_clear_t *)arg, sizeof(clear)))
+       if (copy_from_user(&clear, (drm_i810_clear_t __user *)arg, sizeof(clear)))
                return -EFAULT;
 
        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
@@ -1153,7 +1149,7 @@ int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
        drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
                                        dev_priv->sarea_priv;
 
-       if (copy_from_user(&d, (drm_i810_dma_t *)arg, sizeof(d)))
+       if (copy_from_user(&d, (drm_i810_dma_t __user *)arg, sizeof(d)))
                return -EFAULT;
 
        if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) {
@@ -1168,7 +1164,7 @@ int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
        DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",
                  current->pid, retcode, d.granted);
 
-       if (copy_to_user((drm_dma_t *)arg, &d, sizeof(d)))
+       if (copy_to_user((drm_dma_t __user *)arg, &d, sizeof(d)))
                return -EFAULT;
        sarea_priv->last_dispatch = (int) hw_status[5];
 
@@ -1266,7 +1262,7 @@ int i810_dma_mc(struct inode *inode, struct file *filp,
                dev_priv->sarea_priv;
        drm_i810_mc_t mc;
 
-       if (copy_from_user(&mc, (drm_i810_mc_t *)arg, sizeof(mc)))
+       if (copy_from_user(&mc, (drm_i810_mc_t __user *)arg, sizeof(mc)))
                return -EFAULT;
 
 
@@ -1309,7 +1305,7 @@ int i810_ov0_info(struct inode *inode, struct file *filp,
 
        data.offset = dev_priv->overlay_offset;
        data.physical = dev_priv->overlay_physical;
-       if (copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data)))
+       if (copy_to_user((drm_i810_overlay_t __user *)arg,&data,sizeof(data)))
                return -EFAULT;
        return 0;
 }
@@ -1391,3 +1387,36 @@ int i810_flip_bufs(struct inode *inode, struct file *filp,
        i810_dma_dispatch_flip( dev );
        return 0;
 }
+
+static void i810_driver_pretakedown(drm_device_t *dev)
+{
+       i810_dma_cleanup( dev );
+}
+
+static void i810_driver_release(drm_device_t *dev, struct file *filp)
+{
+       i810_reclaim_buffers(filp);
+}
+
+static int i810_driver_dma_quiescent(drm_device_t *dev)
+{
+       i810_dma_quiescent( dev );
+       return 0;
+}
+
+void i810_driver_register_fns(drm_device_t *dev)
+{
+       dev->driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE;
+       dev->dev_priv_size = sizeof(drm_i810_buf_priv_t);
+       dev->fn_tbl.pretakedown = i810_driver_pretakedown;
+       dev->fn_tbl.release = i810_driver_release;
+       dev->fn_tbl.dma_quiescent = i810_driver_dma_quiescent;
+       dev->fn_tbl.reclaim_buffers = i810_reclaim_buffers;
+
+       dev->counters += 4;
+       dev->types[6] = _DRM_STAT_IRQ;
+       dev->types[7] = _DRM_STAT_PRIMARY;
+       dev->types[8] = _DRM_STAT_SECONDARY;
+       dev->types[9] = _DRM_STAT_DMA;
+}
+