drm: Replace DRM_IOCTL_ARGS with (dev, data, file_priv) and remove DRM_DEVICE.

The data is now in kernel space, copied in/out as appropriate according to t
This results in DRM_COPY_{TO,FROM}_USER going away, and error paths to deal
with those failures.  This also means that XFree86 4.2.0 support for i810 DR
is lost.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 63 insertions, 81 deletions

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 25d8b2b9524d..e61a43e5b3ac 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -251,23 +251,20 @@ static int i915_dma_resume(struct drm_device * dev)
         return 0;
 }
 
-static int i915_dma_init(DRM_IOCTL_ARGS)
+static int i915_dma_init(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv;
-        drm_i915_init_t init;
+        drm_i915_init_t *init = data;
         int retcode = 0;
 
-        DRM_COPY_FROM_USER_IOCTL(init, (drm_i915_init_t __user *) data,
-                                 sizeof(init));
-
-        switch (init.func) {
+        switch (init->func) {
         case I915_INIT_DMA:
                 dev_priv = drm_alloc(sizeof(drm_i915_private_t),
                                      DRM_MEM_DRIVER);
                 if (dev_priv == NULL)
                         return -ENOMEM;
-                retcode = i915_initialize(dev, dev_priv, &init);
+                retcode = i915_initialize(dev, dev_priv, init);
                 break;
         case I915_CLEANUP_DMA:
                 retcode = i915_dma_cleanup(dev);
@@ -598,23 +595,22 @@ static int i915_quiescent(struct drm_device * dev)
         return i915_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 }
 
-static int i915_flush_ioctl(DRM_IOCTL_ARGS)
+static int i915_flush_ioctl(struct drm_device *dev, void *data,
+                            struct drm_file *file_priv)
 {
-        DRM_DEVICE;
-
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         return i915_quiescent(dev);
 }
 
-static int i915_batchbuffer(DRM_IOCTL_ARGS)
+static int i915_batchbuffer(struct drm_device *dev, void *data,
+                            struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
-        drm_i915_batchbuffer_t batch;
+        drm_i915_batchbuffer_t *batch = data;
         int ret;
 
         if (!dev_priv->allow_batchbuffer) {
@@ -622,52 +618,46 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
                 return -EINVAL;
         }
 
-        DRM_COPY_FROM_USER_IOCTL(batch, (drm_i915_batchbuffer_t __user *) data,
-                                 sizeof(batch));
-
         DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n",
-                  batch.start, batch.used, batch.num_cliprects);
+                  batch->start, batch->used, batch->num_cliprects);
 
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-        if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
-                                                       batch.num_cliprects *
+        if (batch->num_cliprects && DRM_VERIFYAREA_READ(batch->cliprects,
+                                                       batch->num_cliprects *
                                                        sizeof(struct drm_clip_rect)))
                 return -EFAULT;
 
-        ret = i915_dispatch_batchbuffer(dev, &batch);
+        ret = i915_dispatch_batchbuffer(dev, batch);
 
         sarea_priv->last_dispatch = (int)hw_status[5];
         return ret;
 }
 
-static int i915_cmdbuffer(DRM_IOCTL_ARGS)
+static int i915_cmdbuffer(struct drm_device *dev, void *data,
+                          struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
         drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
             dev_priv->sarea_priv;
-        drm_i915_cmdbuffer_t cmdbuf;
+        drm_i915_cmdbuffer_t *cmdbuf = data;
         int ret;
 
-        DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_i915_cmdbuffer_t __user *) data,
-                                 sizeof(cmdbuf));
-
         DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n",
-                  cmdbuf.buf, cmdbuf.sz, cmdbuf.num_cliprects);
+                  cmdbuf->buf, cmdbuf->sz, cmdbuf->num_cliprects);
 
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
-        if (cmdbuf.num_cliprects &&
-            DRM_VERIFYAREA_READ(cmdbuf.cliprects,
-                                cmdbuf.num_cliprects *
+        if (cmdbuf->num_cliprects &&
+            DRM_VERIFYAREA_READ(cmdbuf->cliprects,
+                                cmdbuf->num_cliprects *
                                 sizeof(struct drm_clip_rect))) {
                 DRM_ERROR("Fault accessing cliprects\n");
                 return -EFAULT;
         }
 
-        ret = i915_dispatch_cmdbuffer(dev, &cmdbuf);
+        ret = i915_dispatch_cmdbuffer(dev, cmdbuf);
         if (ret) {
                 DRM_ERROR("i915_dispatch_cmdbuffer failed\n");
                 return ret;
@@ -677,10 +667,9 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
         return 0;
 }
 
-static int i915_flip_bufs(DRM_IOCTL_ARGS)
+static int i915_flip_bufs(struct drm_device *dev, void *data,
+                          struct drm_file *file_priv)
 {
-        DRM_DEVICE;
-
         DRM_DEBUG("%s\n", __FUNCTION__);
 
         LOCK_TEST_WITH_RETURN(dev, file_priv);
@@ -688,11 +677,11 @@ static int i915_flip_bufs(DRM_IOCTL_ARGS)
         return i915_dispatch_flip(dev);
 }
 
-static int i915_getparam(DRM_IOCTL_ARGS)
+static int i915_getparam(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_i915_getparam_t param;
+        drm_i915_getparam_t *param = data;
         int value;
 
         if (!dev_priv) {
@@ -700,10 +689,7 @@ static int i915_getparam(DRM_IOCTL_ARGS)
                 return -EINVAL;
         }
 
-        DRM_COPY_FROM_USER_IOCTL(param, (drm_i915_getparam_t __user *) data,
-                                 sizeof(param));
-
-        switch (param.param) {
+        switch (param->param) {
         case I915_PARAM_IRQ_ACTIVE:
                 value = dev->irq ? 1 : 0;
                 break;
@@ -714,11 +700,11 @@ static int i915_getparam(DRM_IOCTL_ARGS)
                 value = READ_BREADCRUMB(dev_priv);
                 break;
         default:
-                DRM_ERROR("Unknown parameter %d\n", param.param);
+                DRM_ERROR("Unknown parameter %d\n", param->param);
                 return -EINVAL;
         }
 
-        if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
+        if (DRM_COPY_TO_USER(param->value, &value, sizeof(int))) {
                 DRM_ERROR("DRM_COPY_TO_USER failed\n");
                 return -EFAULT;
         }
@@ -726,56 +712,52 @@ static int i915_getparam(DRM_IOCTL_ARGS)
         return 0;
 }
 
-static int i915_setparam(DRM_IOCTL_ARGS)
+static int i915_setparam(struct drm_device *dev, void *data,
+                         struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_i915_setparam_t param;
+        drm_i915_setparam_t *param = data;
 
         if (!dev_priv) {
                 DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                 return -EINVAL;
         }
 
-        DRM_COPY_FROM_USER_IOCTL(param, (drm_i915_setparam_t __user *) data,
-                                 sizeof(param));
-
-        switch (param.param) {
+        switch (param->param) {
         case I915_SETPARAM_USE_MI_BATCHBUFFER_START:
                 if (!IS_I965G(dev))
-                        dev_priv->use_mi_batchbuffer_start = param.value;
+                        dev_priv->use_mi_batchbuffer_start = param->value;
                 break;
         case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:
-                dev_priv->tex_lru_log_granularity = param.value;
+                dev_priv->tex_lru_log_granularity = param->value;
                 break;
         case I915_SETPARAM_ALLOW_BATCHBUFFER:
-                dev_priv->allow_batchbuffer = param.value;
+                dev_priv->allow_batchbuffer = param->value;
                 break;
         default:
-                DRM_ERROR("unknown parameter %d\n", param.param);
+                DRM_ERROR("unknown parameter %d\n", param->param);
                 return -EINVAL;
         }
 
         return 0;
 }
 
-static int i915_set_status_page(DRM_IOCTL_ARGS)
+static int i915_set_status_page(struct drm_device *dev, void *data,
+                                struct drm_file *file_priv)
 {
-        DRM_DEVICE;
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_i915_hws_addr_t hws;
+        drm_i915_hws_addr_t *hws = data;
 
         if (!dev_priv) {
                 DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
                 return -EINVAL;
         }
-        DRM_COPY_FROM_USER_IOCTL(hws, (drm_i915_hws_addr_t __user *) data,
-                        sizeof(hws));
-        printk(KERN_DEBUG "set status page addr 0x%08x\n", (u32)hws.addr);
 
-        dev_priv->status_gfx_addr = hws.addr & (0x1ffff<<12);
+        printk(KERN_DEBUG "set status page addr 0x%08x\n", (u32)hws->addr);
+
+        dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);
 
-        dev_priv->hws_map.offset = dev->agp->agp_info.aper_base + hws.addr;
+        dev_priv->hws_map.offset = dev->agp->agp_info.aper_base + hws->addr;
         dev_priv->hws_map.size = 4*1024;
         dev_priv->hws_map.type = 0;
         dev_priv->hws_map.flags = 0;
@@ -829,24 +811,24 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
         }
 }
 
-drm_ioctl_desc_t i915_ioctls[] = {
-        [DRM_IOCTL_NR(DRM_I915_INIT)] = {i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
-        [DRM_IOCTL_NR(DRM_I915_FLUSH)] = {i915_flush_ioctl, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_FLIP)] = {i915_flip_bufs, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_BATCHBUFFER)] = {i915_batchbuffer, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_IRQ_EMIT)] = {i915_irq_emit, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_IRQ_WAIT)] = {i915_irq_wait, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_GETPARAM)] = {i915_getparam, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_SETPARAM)] = {i915_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
-        [DRM_IOCTL_NR(DRM_I915_ALLOC)] = {i915_mem_alloc, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_FREE)] = {i915_mem_free, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_INIT_HEAP)] = {i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY},
-        [DRM_IOCTL_NR(DRM_I915_CMDBUFFER)] = {i915_cmdbuffer, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_DESTROY_HEAP)] = { i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY },
-        [DRM_IOCTL_NR(DRM_I915_SET_VBLANK_PIPE)] = { i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY },
-        [DRM_IOCTL_NR(DRM_I915_GET_VBLANK_PIPE)] = { i915_vblank_pipe_get, DRM_AUTH },
-        [DRM_IOCTL_NR(DRM_I915_VBLANK_SWAP)] = {i915_vblank_swap, DRM_AUTH},
-        [DRM_IOCTL_NR(DRM_I915_HWS_ADDR)] = {i915_set_status_page, DRM_AUTH},
+struct drm_ioctl_desc i915_ioctls[] = {
+        DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_FLIP, i915_flip_bufs, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_BATCHBUFFER, i915_batchbuffer, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_IRQ_EMIT, i915_irq_emit, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_IRQ_WAIT, i915_irq_wait, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_GETPARAM, i915_getparam, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_SETPARAM, i915_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I915_ALLOC, i915_mem_alloc, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_FREE, i915_mem_free, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_INIT_HEAP, i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF(DRM_I915_CMDBUFFER, i915_cmdbuffer, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_DESTROY_HEAP,  i915_mem_destroy_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),
+        DRM_IOCTL_DEF(DRM_I915_SET_VBLANK_PIPE,  i915_vblank_pipe_set, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY ),
+        DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH ),
+        DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
+        DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),
 };
 
 int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);