drm: Replace filp in ioctl arguments with drm_file *file_priv.

As a fallout, replace filp storage with file_priv storage for "unique
identifier of a client" all over the DRM.  There is a 1:1 mapping, so this
should be a noop.  This could be a minor performance improvement, as everyth
on Linux dereferenced filp to get file_priv anyway, while only the mmap ioct
went the other direction.

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

1 files changed, 58 insertions, 69 deletions

diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index bfb35ab11809..3f1aca87432f 100644
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -120,10 +120,9 @@ static const struct file_operations i810_buffer_fops = {
         .fasync = drm_fasync,
 };
 
-static int i810_map_buffer(struct drm_buf * buf, struct file *filp)
+static int i810_map_buffer(struct drm_buf * buf, struct drm_file *file_priv)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_buf_priv_t *buf_priv = buf->dev_private;
         drm_i810_private_t *dev_priv = dev->dev_private;
         const struct file_operations *old_fops;
@@ -133,14 +132,14 @@ static int i810_map_buffer(struct drm_buf * buf, struct file *filp)
                 return -EINVAL;
 
         down_write(&current->mm->mmap_sem);
-        old_fops = filp->f_op;
-        filp->f_op = &i810_buffer_fops;
+        old_fops = file_priv->filp->f_op;
+        file_priv->filp->f_op = &i810_buffer_fops;
         dev_priv->mmap_buffer = buf;
-        buf_priv->virtual = (void *)do_mmap(filp, 0, buf->total,
+        buf_priv->virtual = (void *)do_mmap(file_priv->filp, 0, buf->total,
                                             PROT_READ | PROT_WRITE,
                                             MAP_SHARED, buf->bus_address);
         dev_priv->mmap_buffer = NULL;
-        filp->f_op = old_fops;
+        file_priv->filp->f_op = old_fops;
         if (IS_ERR(buf_priv->virtual)) {
                 /* Real error */
                 DRM_ERROR("mmap error\n");
@@ -173,7 +172,7 @@ static int i810_unmap_buffer(struct drm_buf * buf)
 }
 
 static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
-                               struct file *filp)
+                               struct drm_file *file_priv)
 {
         struct drm_buf *buf;
         drm_i810_buf_priv_t *buf_priv;
@@ -186,13 +185,13 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
                 return retcode;
         }
 
-        retcode = i810_map_buffer(buf, filp);
+        retcode = i810_map_buffer(buf, file_priv);
         if (retcode) {
                 i810_freelist_put(dev, buf);
                 DRM_ERROR("mapbuf failed, retcode %d\n", retcode);
                 return retcode;
         }
-        buf->filp = filp;
+        buf->file_priv = file_priv;
         buf_priv = buf->dev_private;
         d->granted = 1;
         d->request_idx = buf->idx;
@@ -473,11 +472,10 @@ static int i810_dma_init_compat(drm_i810_init_t * init, unsigned long arg)
         return 0;
 }
 
-static int i810_dma_init(struct inode *inode, struct file *filp,
+static int i810_dma_init(struct inode *inode, struct drm_file *file_priv,
                          unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv;
         drm_i810_init_t init;
         int retcode = 0;
@@ -968,7 +966,8 @@ static int i810_flush_queue(struct drm_device * dev)
 }
 
 /* Must be called with the lock held */
-static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
+static void i810_reclaim_buffers(struct drm_device * dev,
+                                 struct drm_file *file_priv)
 {
         struct drm_device_dma *dma = dev->dma;
         int i;
@@ -986,7 +985,7 @@ static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
                 struct drm_buf *buf = dma->buflist[i];
                 drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
-                if (buf->filp == filp && buf_priv) {
+                if (buf->file_priv == file_priv && buf_priv) {
                         int used = cmpxchg(buf_priv->in_use, I810_BUF_CLIENT,
                                            I810_BUF_FREE);
 
@@ -998,23 +997,21 @@ static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
         }
 }
 
-static int i810_flush_ioctl(struct inode *inode, struct file *filp,
+static int i810_flush_ioctl(struct inode *inode, struct drm_file *file_priv,
                             unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         i810_flush_queue(dev);
         return 0;
 }
 
-static int i810_dma_vertex(struct inode *inode, struct file *filp,
+static int i810_dma_vertex(struct inode *inode, struct drm_file *file_priv,
                            unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         struct drm_device_dma *dma = dev->dma;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
@@ -1026,7 +1023,7 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp,
             (&vertex, (drm_i810_vertex_t __user *) arg, sizeof(vertex)))
                 return -EFAULT;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n",
                   vertex.idx, vertex.used, vertex.discard);
@@ -1046,18 +1043,17 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp,
         return 0;
 }
 
-static int i810_clear_bufs(struct inode *inode, struct file *filp,
+static int i810_clear_bufs(struct inode *inode, struct drm_file *file_priv,
                            unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_clear_t clear;
 
         if (copy_from_user
             (&clear, (drm_i810_clear_t __user *) arg, sizeof(clear)))
                 return -EFAULT;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         /* GH: Someone's doing nasty things... */
         if (!dev->dev_private) {
@@ -1069,25 +1065,24 @@ static int i810_clear_bufs(struct inode *inode, struct file *filp,
         return 0;
 }
 
-static int i810_swap_bufs(struct inode *inode, struct file *filp,
+static int i810_swap_bufs(struct inode *inode, struct drm_file *file_priv,
                           unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
 
         DRM_DEBUG("i810_swap_bufs\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         i810_dma_dispatch_swap(dev);
         return 0;
 }
 
-static int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+static int i810_getage(struct inode *inode, struct drm_file *file_priv,
+                       unsigned int cmd,
                        unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
         drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
@@ -1097,11 +1092,10 @@ static int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd,
         return 0;
 }
 
-static int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
-                       unsigned long arg)
+static int i810_getbuf(struct inode *inode, struct drm_file *file_priv,
+                       unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         int retcode = 0;
         drm_i810_dma_t d;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
@@ -1112,11 +1106,11 @@ static int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
         if (copy_from_user(&d, (drm_i810_dma_t __user *) arg, sizeof(d)))
                 return -EFAULT;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         d.granted = 0;
 
-        retcode = i810_dma_get_buffer(dev, &d, filp);
+        retcode = i810_dma_get_buffer(dev, &d, file_priv);
 
         DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",
                   current->pid, retcode, d.granted);
@@ -1128,15 +1122,15 @@ static int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
         return retcode;
 }
 
-static int i810_copybuf(struct inode *inode,
-                        struct file *filp, unsigned int cmd, unsigned long arg)
+static int i810_copybuf(struct inode *inode, struct drm_file *file_priv,
+                        unsigned int cmd, unsigned long arg)
 {
         /* Never copy - 2.4.x doesn't need it */
         return 0;
 }
 
-static int i810_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
-                       unsigned long arg)
+static int i810_docopy(struct inode *inode, struct drm_file *file_priv,
+                       unsigned int cmd, unsigned long arg)
 {
         /* Never copy - 2.4.x doesn't need it */
         return 0;
@@ -1202,11 +1196,10 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
         ADVANCE_LP_RING();
 }
 
-static int i810_dma_mc(struct inode *inode, struct file *filp,
+static int i810_dma_mc(struct inode *inode, struct drm_file *file_priv,
                        unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         struct drm_device_dma *dma = dev->dma;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
         u32 *hw_status = dev_priv->hw_status_page;
@@ -1217,7 +1210,7 @@ static int i810_dma_mc(struct inode *inode, struct file *filp,
         if (copy_from_user(&mc, (drm_i810_mc_t __user *) arg, sizeof(mc)))
                 return -EFAULT;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (mc.idx >= dma->buf_count || mc.idx < 0)
                 return -EINVAL;
@@ -1233,21 +1226,19 @@ static int i810_dma_mc(struct inode *inode, struct file *filp,
         return 0;
 }
 
-static int i810_rstatus(struct inode *inode, struct file *filp,
+static int i810_rstatus(struct inode *inode, struct drm_file *file_priv,
                         unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
 
         return (int)(((u32 *) (dev_priv->hw_status_page))[4]);
 }
 
-static int i810_ov0_info(struct inode *inode, struct file *filp,
+static int i810_ov0_info(struct inode *inode, struct drm_file *file_priv,
                          unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
         drm_i810_overlay_t data;
 
@@ -1259,26 +1250,24 @@ static int i810_ov0_info(struct inode *inode, struct file *filp,
         return 0;
 }
 
-static int i810_fstatus(struct inode *inode, struct file *filp,
+static int i810_fstatus(struct inode *inode, struct drm_file *file_priv,
                         unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         return I810_READ(0x30008);
 }
 
-static int i810_ov0_flip(struct inode *inode, struct file *filp,
+static int i810_ov0_flip(struct inode *inode, struct drm_file *file_priv,
                          unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         //Tell the overlay to update
         I810_WRITE(0x30000, dev_priv->overlay_physical | 0x80000000);
@@ -1310,16 +1299,15 @@ static int i810_do_cleanup_pageflip(struct drm_device * dev)
         return 0;
 }
 
-static int i810_flip_bufs(struct inode *inode, struct file *filp,
+static int i810_flip_bufs(struct inode *inode, struct drm_file *file_priv,
                           unsigned int cmd, unsigned long arg)
 {
-        struct drm_file *priv = filp->private_data;
-        struct drm_device *dev = priv->head->dev;
+        struct drm_device *dev = file_priv->head->dev;
         drm_i810_private_t *dev_priv = dev->dev_private;
 
         DRM_DEBUG("%s\n", __FUNCTION__);
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (!dev_priv->page_flipping)
                 i810_do_init_pageflip(dev);
@@ -1345,7 +1333,7 @@ void i810_driver_lastclose(struct drm_device * dev)
         i810_dma_cleanup(dev);
 }
 
-void i810_driver_preclose(struct drm_device * dev, DRMFILE filp)
+void i810_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
 {
         if (dev->dev_private) {
                 drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1355,9 +1343,10 @@ void i810_driver_preclose(struct drm_device * dev, DRMFILE filp)
         }
 }
 
-void i810_driver_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)
+void i810_driver_reclaim_buffers_locked(struct drm_device * dev,
+                                        struct drm_file *file_priv)
 {
-        i810_reclaim_buffers(dev, filp);
+        i810_reclaim_buffers(dev, file_priv);
 }
 
 int i810_driver_dma_quiescent(struct drm_device * dev)