Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / gpu / drm / virtio / virtgpu_ioctl.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index b4de18e..c046903 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -133,8 +133,7 @@ static int virtio_gpu_execbuffer(struct drm_device *dev,
                }
 
                for (i = 0; i < exbuf->num_bo_handles; i++) {
-                       gobj = drm_gem_object_lookup(dev,
-                                                    drm_file, bo_handles[i]);
+                       gobj = drm_gem_object_lookup(drm_file, bo_handles[i]);
                        if (!gobj) {
                                drm_free_large(bo_handles);
                                drm_free_large(buflist);
@@ -345,7 +344,7 @@ static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
        struct drm_gem_object *gobj = NULL;
        struct virtio_gpu_object *qobj = NULL;
 
-       gobj = drm_gem_object_lookup(dev, file_priv, ri->bo_handle);
+       gobj = drm_gem_object_lookup(file_priv, ri->bo_handle);
        if (gobj == NULL)
                return -ENOENT;
 
@@ -374,7 +373,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
        if (vgdev->has_virgl_3d == false)
                return -ENOSYS;
 
-       gobj = drm_gem_object_lookup(dev, file, args->bo_handle);
+       gobj = drm_gem_object_lookup(file, args->bo_handle);
        if (gobj == NULL)
                return -ENOENT;
 
@@ -418,7 +417,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
        int ret;
        u32 offset = args->offset;
 
-       gobj = drm_gem_object_lookup(dev, file, args->bo_handle);
+       gobj = drm_gem_object_lookup(file, args->bo_handle);
        if (gobj == NULL)
                return -ENOENT;
 
@@ -464,7 +463,7 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
        int ret;
        bool nowait = false;
 
-       gobj = drm_gem_object_lookup(dev, file, args->handle);
+       gobj = drm_gem_object_lookup(file, args->handle);
        if (gobj == NULL)
                return -ENOENT;