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, 17 insertions, 14 deletions

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index a023fce3f1b1..af95b5897a0c 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1828,7 +1828,7 @@ int radeon_cp_init(DRM_IOCTL_ARGS)
         DRM_DEVICE;
         drm_radeon_init_t init;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         DRM_COPY_FROM_USER_IOCTL(init, (drm_radeon_init_t __user *) data,
                                  sizeof(init));
@@ -1854,7 +1854,7 @@ int radeon_cp_start(DRM_IOCTL_ARGS)
         drm_radeon_private_t *dev_priv = dev->dev_private;
         DRM_DEBUG("\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (dev_priv->cp_running) {
                 DRM_DEBUG("%s while CP running\n", __FUNCTION__);
@@ -1882,7 +1882,7 @@ int radeon_cp_stop(DRM_IOCTL_ARGS)
         int ret;
         DRM_DEBUG("\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         DRM_COPY_FROM_USER_IOCTL(stop, (drm_radeon_cp_stop_t __user *) data,
                                  sizeof(stop));
@@ -1969,7 +1969,7 @@ int radeon_cp_reset(DRM_IOCTL_ARGS)
         drm_radeon_private_t *dev_priv = dev->dev_private;
         DRM_DEBUG("\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (!dev_priv) {
                 DRM_DEBUG("%s called before init done\n", __FUNCTION__);
@@ -1990,7 +1990,7 @@ int radeon_cp_idle(DRM_IOCTL_ARGS)
         drm_radeon_private_t *dev_priv = dev->dev_private;
         DRM_DEBUG("\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         return radeon_do_cp_idle(dev_priv);
 }
@@ -2009,7 +2009,7 @@ int radeon_engine_reset(DRM_IOCTL_ARGS)
         DRM_DEVICE;
         DRM_DEBUG("\n");
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         return radeon_do_engine_reset(dev);
 }
@@ -2066,8 +2066,9 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev)
                 for (i = start; i < dma->buf_count; i++) {
                         buf = dma->buflist[i];
                         buf_priv = buf->dev_private;
-                        if (buf->filp == 0 || (buf->pending &&
-                                               buf_priv->age <= done_age)) {
+                        if (buf->file_priv == NULL || (buf->pending &&
+                                                       buf_priv->age <=
+                                                       done_age)) {
                                 dev_priv->stats.requested_bufs++;
                                 buf->pending = 0;
                                 return buf;
@@ -2106,8 +2107,9 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev)
                 for (i = start; i < dma->buf_count; i++) {
                         buf = dma->buflist[i];
                         buf_priv = buf->dev_private;
-                        if (buf->filp == 0 || (buf->pending &&
-                                               buf_priv->age <= done_age)) {
+                        if (buf->file_priv == 0 || (buf->pending &&
+                                                    buf_priv->age <=
+                                                    done_age)) {
                                 dev_priv->stats.requested_bufs++;
                                 buf->pending = 0;
                                 return buf;
@@ -2170,7 +2172,8 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n)
         return -EBUSY;
 }
 
-static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
+static int radeon_cp_get_buffers(struct drm_device *dev,
+                                 struct drm_file *file_priv,
                                  struct drm_dma * d)
 {
         int i;
@@ -2181,7 +2184,7 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
                 if (!buf)
                         return -EBUSY;  /* NOTE: broken client */
 
-                buf->filp = filp;
+                buf->file_priv = file_priv;
 
                 if (DRM_COPY_TO_USER(&d->request_indices[i], &buf->idx,
                                      sizeof(buf->idx)))
@@ -2203,7 +2206,7 @@ int radeon_cp_buffers(DRM_IOCTL_ARGS)
         struct drm_dma __user *argp = (void __user *)data;
         struct drm_dma d;
 
-        LOCK_TEST_WITH_RETURN(dev, filp);
+        LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         DRM_COPY_FROM_USER_IOCTL(d, argp, sizeof(d));
 
@@ -2226,7 +2229,7 @@ int radeon_cp_buffers(DRM_IOCTL_ARGS)
         d.granted_count = 0;
 
         if (d.request_count) {
-                ret = radeon_cp_get_buffers(filp, dev, &d);
+                ret = radeon_cp_get_buffers(dev, file_priv, &d);
         }
 
         DRM_COPY_TO_USER_IOCTL(argp, d, sizeof(d));