Commit 30349f8f authored by Gurchetan Singh's avatar Gurchetan Singh Committed by Gerd Hoffmann

drm/virtio: use consistent names for drm_files

Minor cleanup, change:

- file_priv--> file,
- drm_file --> file.
Reviewed-by: default avatarChia-I Wu <olvaffe@gmail.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Signed-off-by: default avatarGurchetan Singh <gurchetansingh@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200225000800.2966-1-gurchetansingh@chromium.orgSigned-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent a8dada7a
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
#include "virtgpu_drv.h" #include "virtgpu_drv.h"
static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file)
{ {
struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_device *vgdev = dev->dev_private;
struct drm_virtgpu_map *virtio_gpu_map = data; struct drm_virtgpu_map *virtio_gpu_map = data;
return virtio_gpu_mode_dumb_mmap(file_priv, vgdev->ddev, return virtio_gpu_mode_dumb_mmap(file, vgdev->ddev,
virtio_gpu_map->handle, virtio_gpu_map->handle,
&virtio_gpu_map->offset); &virtio_gpu_map->offset);
} }
...@@ -51,11 +51,11 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data, ...@@ -51,11 +51,11 @@ static int virtio_gpu_map_ioctl(struct drm_device *dev, void *data,
* VIRTIO_GPUReleaseInfo struct (first XXX bytes) * VIRTIO_GPUReleaseInfo struct (first XXX bytes)
*/ */
static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
struct drm_file *drm_file) struct drm_file *file)
{ {
struct drm_virtgpu_execbuffer *exbuf = data; struct drm_virtgpu_execbuffer *exbuf = data;
struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_device *vgdev = dev->dev_private;
struct virtio_gpu_fpriv *vfpriv = drm_file->driver_priv; struct virtio_gpu_fpriv *vfpriv = file->driver_priv;
struct virtio_gpu_fence *out_fence; struct virtio_gpu_fence *out_fence;
int ret; int ret;
uint32_t *bo_handles = NULL; uint32_t *bo_handles = NULL;
...@@ -116,7 +116,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, ...@@ -116,7 +116,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
goto out_unused_fd; goto out_unused_fd;
} }
buflist = virtio_gpu_array_from_handles(drm_file, bo_handles, buflist = virtio_gpu_array_from_handles(file, bo_handles,
exbuf->num_bo_handles); exbuf->num_bo_handles);
if (!buflist) { if (!buflist) {
ret = -ENOENT; ret = -ENOENT;
...@@ -178,7 +178,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, ...@@ -178,7 +178,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data,
} }
static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file)
{ {
struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_device *vgdev = dev->dev_private;
struct drm_virtgpu_getparam *param = data; struct drm_virtgpu_getparam *param = data;
...@@ -201,7 +201,7 @@ static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data, ...@@ -201,7 +201,7 @@ static int virtio_gpu_getparam_ioctl(struct drm_device *dev, void *data,
} }
static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file)
{ {
struct virtio_gpu_device *vgdev = dev->dev_private; struct virtio_gpu_device *vgdev = dev->dev_private;
struct drm_virtgpu_resource_create *rc = data; struct drm_virtgpu_resource_create *rc = data;
...@@ -252,7 +252,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, ...@@ -252,7 +252,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
return ret; return ret;
obj = &qobj->base.base; obj = &qobj->base.base;
ret = drm_gem_handle_create(file_priv, obj, &handle); ret = drm_gem_handle_create(file, obj, &handle);
if (ret) { if (ret) {
drm_gem_object_release(obj); drm_gem_object_release(obj);
return ret; return ret;
...@@ -265,13 +265,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, ...@@ -265,13 +265,13 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
} }
static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data, static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file)
{ {
struct drm_virtgpu_resource_info *ri = data; struct drm_virtgpu_resource_info *ri = data;
struct drm_gem_object *gobj = NULL; struct drm_gem_object *gobj = NULL;
struct virtio_gpu_object *qobj = NULL; struct virtio_gpu_object *qobj = NULL;
gobj = drm_gem_object_lookup(file_priv, ri->bo_handle); gobj = drm_gem_object_lookup(file, ri->bo_handle);
if (gobj == NULL) if (gobj == NULL)
return -ENOENT; return -ENOENT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment