diff options
| author | Eric Anholt <eric@anholt.net> | 2007-07-20 06:39:25 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-07-20 13:39:45 -0700 |
| commit | c1119b1b092527fbb6950d0b5e51e076ddb00f29 (patch) | |
| tree | 1d4b0f26e40d572e4c92eb4ebde88e60b9b137e5 /shared-core/mach64_dma.c | |
| parent | 35de4868361ce1fb515cf33f27e6be4c59b07f89 (diff) | |
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 everything
on Linux dereferenced filp to get file_priv anyway, while only the mmap ioctls
went the other direction.
Diffstat (limited to 'shared-core/mach64_dma.c')
| -rw-r--r-- | shared-core/mach64_dma.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/shared-core/mach64_dma.c b/shared-core/mach64_dma.c index fec73076..25877824 100644 --- a/shared-core/mach64_dma.c +++ b/shared-core/mach64_dma.c @@ -1165,7 +1165,7 @@ int mach64_dma_init(DRM_IOCTL_ARGS) DRM_DEBUG("%s\n", __FUNCTION__); - LOCK_TEST_WITH_RETURN(dev, filp); + LOCK_TEST_WITH_RETURN(dev, file_priv); DRM_COPY_FROM_USER_IOCTL(init, (drm_mach64_init_t *) data, sizeof(init)); @@ -1187,7 +1187,7 @@ int mach64_dma_idle(DRM_IOCTL_ARGS) DRM_DEBUG("%s\n", __FUNCTION__); - LOCK_TEST_WITH_RETURN(dev, filp); + LOCK_TEST_WITH_RETURN(dev, file_priv); return mach64_do_dma_idle(dev_priv); } @@ -1199,7 +1199,7 @@ int mach64_dma_flush(DRM_IOCTL_ARGS) DRM_DEBUG("%s\n", __FUNCTION__); - LOCK_TEST_WITH_RETURN(dev, filp); + LOCK_TEST_WITH_RETURN(dev, file_priv); return mach64_do_dma_flush(dev_priv); } @@ -1211,7 +1211,7 @@ int mach64_engine_reset(DRM_IOCTL_ARGS) DRM_DEBUG("%s\n", __FUNCTION__); - LOCK_TEST_WITH_RETURN(dev, filp); + LOCK_TEST_WITH_RETURN(dev, file_priv); return mach64_do_engine_reset(dev_priv); } @@ -1461,7 +1461,8 @@ int mach64_freelist_put(drm_mach64_private_t * dev_priv, struct drm_buf * copy_b /** \name DMA buffer request and submission IOCTL handler */ /*@{*/ -static int mach64_dma_get_buffers(DRMFILE filp, struct drm_device * dev, +static int mach64_dma_get_buffers(struct drm_device * dev, + struct drm_file *file_priv, struct drm_dma * d) { int i; @@ -1478,7 +1479,7 @@ static int mach64_dma_get_buffers(DRMFILE filp, struct drm_device * dev, return -EAGAIN; #endif - buf->filp = filp; + buf->file_priv = file_priv; if (DRM_COPY_TO_USER(&d->request_indices[i], &buf->idx, sizeof(buf->idx))) @@ -1499,7 +1500,7 @@ int mach64_dma_buffers(DRM_IOCTL_ARGS) struct drm_dma d; int ret = 0; - LOCK_TEST_WITH_RETURN(dev, filp); + LOCK_TEST_WITH_RETURN(dev, file_priv); DRM_COPY_FROM_USER_IOCTL(d, (struct drm_dma *) data, sizeof(d)); @@ -1522,7 +1523,7 @@ int mach64_dma_buffers(DRM_IOCTL_ARGS) d.granted_count = 0; if (d.request_count) { - ret = mach64_dma_get_buffers(filp, dev, &d); + ret = mach64_dma_get_buffers(dev, file_priv, &d); } DRM_COPY_TO_USER_IOCTL((struct drm_dma *) data, d, sizeof(d)); |