aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/virtio
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2016-05-09 06:04:54 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-17 02:47:30 -0400
commita8ad0bd84f986072314595d05444719fdf29e412 (patch)
tree115e710456a7299f92079e21a97ead1e85d403c9 /drivers/gpu/drm/virtio
parent99ee87295017e36abb6925e6139ca303cb55aee7 (diff)
drm: Remove unused drm_device from drm_gem_object_lookup()
drm_gem_object_lookup() has never required the drm_device for its file local translation of the user handle to the GEM object. Let's remove the unused parameter and save some space. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: dri-devel@lists.freedesktop.org Cc: Dave Airlie <airlied@redhat.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> [danvet: Fixup kerneldoc too.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/virtio')
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_display.c4
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_gem.c2
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_ioctl.c11
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index d37ecad0c243..d4305da88f44 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -68,7 +68,7 @@ static int virtio_gpu_crtc_cursor_set(struct drm_crtc *crtc,
68 } 68 }
69 69
70 /* lookup the cursor */ 70 /* lookup the cursor */
71 gobj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 71 gobj = drm_gem_object_lookup(file_priv, handle);
72 if (gobj == NULL) 72 if (gobj == NULL)
73 return -ENOENT; 73 return -ENOENT;
74 74
@@ -447,7 +447,7 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
447 int ret; 447 int ret;
448 448
449 /* lookup object associated with res handle */ 449 /* lookup object associated with res handle */
450 obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); 450 obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
451 if (!obj) 451 if (!obj)
452 return ERR_PTR(-EINVAL); 452 return ERR_PTR(-EINVAL);
453 453
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index 1feb7cee3f0d..336a57fd6d5d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -130,7 +130,7 @@ int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv,
130 struct drm_gem_object *gobj; 130 struct drm_gem_object *gobj;
131 struct virtio_gpu_object *obj; 131 struct virtio_gpu_object *obj;
132 BUG_ON(!offset_p); 132 BUG_ON(!offset_p);
133 gobj = drm_gem_object_lookup(dev, file_priv, handle); 133 gobj = drm_gem_object_lookup(file_priv, handle);
134 if (gobj == NULL) 134 if (gobj == NULL)
135 return -ENOENT; 135 return -ENOENT;
136 obj = gem_to_virtio_gpu_obj(gobj); 136 obj = gem_to_virtio_gpu_obj(gobj);
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index b4de18e65db8..c046903cb47b 100644
--- 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,
133 } 133 }
134 134
135 for (i = 0; i < exbuf->num_bo_handles; i++) { 135 for (i = 0; i < exbuf->num_bo_handles; i++) {
136 gobj = drm_gem_object_lookup(dev, 136 gobj = drm_gem_object_lookup(drm_file, bo_handles[i]);
137 drm_file, bo_handles[i]);
138 if (!gobj) { 137 if (!gobj) {
139 drm_free_large(bo_handles); 138 drm_free_large(bo_handles);
140 drm_free_large(buflist); 139 drm_free_large(buflist);
@@ -345,7 +344,7 @@ static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
345 struct drm_gem_object *gobj = NULL; 344 struct drm_gem_object *gobj = NULL;
346 struct virtio_gpu_object *qobj = NULL; 345 struct virtio_gpu_object *qobj = NULL;
347 346
348 gobj = drm_gem_object_lookup(dev, file_priv, ri->bo_handle); 347 gobj = drm_gem_object_lookup(file_priv, ri->bo_handle);
349 if (gobj == NULL) 348 if (gobj == NULL)
350 return -ENOENT; 349 return -ENOENT;
351 350
@@ -374,7 +373,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
374 if (vgdev->has_virgl_3d == false) 373 if (vgdev->has_virgl_3d == false)
375 return -ENOSYS; 374 return -ENOSYS;
376 375
377 gobj = drm_gem_object_lookup(dev, file, args->bo_handle); 376 gobj = drm_gem_object_lookup(file, args->bo_handle);
378 if (gobj == NULL) 377 if (gobj == NULL)
379 return -ENOENT; 378 return -ENOENT;
380 379
@@ -418,7 +417,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
418 int ret; 417 int ret;
419 u32 offset = args->offset; 418 u32 offset = args->offset;
420 419
421 gobj = drm_gem_object_lookup(dev, file, args->bo_handle); 420 gobj = drm_gem_object_lookup(file, args->bo_handle);
422 if (gobj == NULL) 421 if (gobj == NULL)
423 return -ENOENT; 422 return -ENOENT;
424 423
@@ -464,7 +463,7 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
464 int ret; 463 int ret;
465 bool nowait = false; 464 bool nowait = false;
466 465
467 gobj = drm_gem_object_lookup(dev, file, args->handle); 466 gobj = drm_gem_object_lookup(file, args->handle);
468 if (gobj == NULL) 467 if (gobj == NULL)
469 return -ENOENT; 468 return -ENOENT;
470 469