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>

64 files changed, 133 insertions, 144 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
index 35d0856738ae..823bf5e0b0c8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev,
                 struct amdgpu_bo *bo;
                 struct mm_struct *usermm;
 
-                gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle);
+                gobj = drm_gem_object_lookup(filp, info[i].bo_handle);
                 if (!gobj) {
                         r = -ENOENT;
                         goto error_free;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 2bbeeb07c187..9bc8f1d99733 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -92,8 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
 {
         struct drm_gem_object *gobj;
 
-        gobj = drm_gem_object_lookup(p->adev->ddev, p->filp,
-                                     data->handle);
+        gobj = drm_gem_object_lookup(p->filp, data->handle);
         if (gobj == NULL)
                 return -EINVAL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 726803069fef..b0832da2ef7e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -563,7 +563,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev,
         struct amdgpu_framebuffer *amdgpu_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (obj ==  NULL) {
                 dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
                         "can't create framebuffer\n", mode_cmd->handles[0]);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index c68f4cacaa85..8fab6486064f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -338,7 +338,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp,
         struct drm_gem_object *gobj;
         struct amdgpu_bo *robj;
 
-        gobj = drm_gem_object_lookup(dev, filp, handle);
+        gobj = drm_gem_object_lookup(filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -402,7 +402,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         int r = 0;
         long ret;
 
-        gobj = drm_gem_object_lookup(dev, filp, handle);
+        gobj = drm_gem_object_lookup(filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -436,7 +436,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data,
         int r = -1;
 
         DRM_DEBUG("%d \n", args->handle);
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         robj = gem_to_amdgpu_bo(gobj);
@@ -584,7 +584,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         rbo = gem_to_amdgpu_bo(gobj);
@@ -646,7 +646,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,
         struct amdgpu_bo *robj;
         int r;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index be1cf388c2ec..8227344d2ff6 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 1e0988572a2f..c11b6007af80 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2605,7 +2605,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
index c087f930d67e..3fb65e41a6ef 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 0293eb74d777..a9b7e0f36513 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -911,7 +911,7 @@ static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
                 if (w > 64 || h > 64 || (w > 32 && h > 32))
                         return -ENOMEM;
 
-                obj = armada_gem_object_lookup(dev, file, handle);
+                obj = armada_gem_object_lookup(file, handle);
                 if (!obj)
                         return -ENOENT;
 
diff --git a/drivers/gpu/drm/armada/armada_fb.c b/drivers/gpu/drm/armada/armada_fb.c
index 5fa4bf20b232..f03c212b754d 100644
--- a/drivers/gpu/drm/armada/armada_fb.c
+++ b/drivers/gpu/drm/armada/armada_fb.c
@@ -120,7 +120,7 @@ static struct drm_framebuffer *armada_fb_create(struct drm_device *dev,
                 goto err;
         }
 
-        obj = armada_gem_object_lookup(dev, dfile, mode->handles[0]);
+        obj = armada_gem_object_lookup(dfile, mode->handles[0]);
         if (!obj) {
                 ret = -ENOENT;
                 goto err;
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index aca7f9cc6109..88e7fc797721 100644
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -278,7 +278,7 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
         struct armada_gem_object *obj;
         int ret = 0;
 
-        obj = armada_gem_object_lookup(dev, file, handle);
+        obj = armada_gem_object_lookup(file, handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object\n");
                 return -EINVAL;
@@ -348,7 +348,7 @@ int armada_gem_mmap_ioctl(struct drm_device *dev, void *data,
         struct armada_gem_object *dobj;
         unsigned long addr;
 
-        dobj = armada_gem_object_lookup(dev, file, args->handle);
+        dobj = armada_gem_object_lookup(file, args->handle);
         if (dobj == NULL)
                 return -ENOENT;
 
@@ -391,7 +391,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        dobj = armada_gem_object_lookup(dev, file, args->handle);
+        dobj = armada_gem_object_lookup(file, args->handle);
         if (dobj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/armada/armada_gem.h b/drivers/gpu/drm/armada/armada_gem.h
index b000ea3a829a..b88d2b9853c7 100644
--- a/drivers/gpu/drm/armada/armada_gem.h
+++ b/drivers/gpu/drm/armada/armada_gem.h
@@ -45,9 +45,9 @@ struct drm_gem_object *armada_gem_prime_import(struct drm_device *,
 int armada_gem_map_import(struct armada_gem_object *);
 
 static inline struct armada_gem_object *armada_gem_object_lookup(
-        struct drm_device *dev, struct drm_file *dfile, unsigned handle)
+        struct drm_file *dfile, unsigned handle)
 {
-        struct drm_gem_object *obj = drm_gem_object_lookup(dev, dfile, handle);
+        struct drm_gem_object *obj = drm_gem_object_lookup(dfile, handle);
 
         return obj ? drm_to_armada_gem(obj) : NULL;
 }
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index b1480acbb3c3..7bc3aa6dda8c 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -333,7 +333,7 @@ ast_user_framebuffer_create(struct drm_device *dev,
         struct ast_framebuffer *ast_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
@@ -574,7 +574,7 @@ ast_dumb_mmap_offset(struct drm_file *file,
         struct drm_gem_object *obj;
         struct ast_bo *bo;
 
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index a965e7e8ad6e..c337922606e3 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1141,7 +1141,7 @@ static int ast_cursor_set(struct drm_crtc *crtc,
         if (width > AST_MAX_HWC_WIDTH || height > AST_MAX_HWC_HEIGHT)
                 return -EINVAL;
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc\n", handle);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/bochs/bochs_mm.c b/drivers/gpu/drm/bochs/bochs_mm.c
index 24a30f64ed2d..6cf912c45e48 100644
--- a/drivers/gpu/drm/bochs/bochs_mm.c
+++ b/drivers/gpu/drm/bochs/bochs_mm.c
@@ -458,7 +458,7 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,
         struct drm_gem_object *obj;
         struct bochs_bo *bo;
 
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL)
                 return -ENOENT;
 
@@ -520,7 +520,7 @@ bochs_user_framebuffer_create(struct drm_device *dev,
         if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888)
                 return ERR_PTR(-ENOENT);
 
-        obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c
index 0907715e90fd..32d32c5b7b17 100644
--- a/drivers/gpu/drm/cirrus/cirrus_main.c
+++ b/drivers/gpu/drm/cirrus/cirrus_main.c
@@ -61,7 +61,7 @@ cirrus_user_framebuffer_create(struct drm_device *dev,
                                       bpp, mode_cmd->pitches[0]))
                 return ERR_PTR(-EINVAL);
 
-        obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
@@ -295,7 +295,7 @@ cirrus_dumb_mmap_offset(struct drm_file *file,
         struct drm_gem_object *obj;
         struct cirrus_bo *bo;
 
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 3165ac0e93e5..72db38ef4f11 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -183,7 +183,7 @@ struct drm_framebuffer *drm_fb_cma_create(struct drm_device *dev,
                 unsigned int height = mode_cmd->height / (i ? vsub : 1);
                 unsigned int min_size;
 
-                obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[i]);
+                obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]);
                 if (!obj) {
                         dev_err(dev->dev, "Failed to lookup GEM object\n");
                         ret = -ENXIO;
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index f716308fb48c..32156060b9c9 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -588,7 +588,6 @@ EXPORT_SYMBOL(drm_gem_put_pages);
 
 /**
  * drm_gem_object_lookup - look up a GEM object from it's handle
- * @dev: DRM device
  * @filp: DRM file private date
  * @handle: userspace handle
  *
@@ -598,8 +597,7 @@ EXPORT_SYMBOL(drm_gem_put_pages);
  * otherwise.
  */
 struct drm_gem_object *
-drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
-                      u32 handle)
+drm_gem_object_lookup(struct drm_file *filp, u32 handle)
 {
         struct drm_gem_object *obj;
 
@@ -607,12 +605,8 @@ drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
 
         /* Check if we currently have a reference on the object */
         obj = idr_find(&filp->object_idr, handle);
-        if (obj == NULL) {
-                spin_unlock(&filp->table_lock);
-                return NULL;
-        }
-
-        drm_gem_object_reference(obj);
+        if (obj)
+                drm_gem_object_reference(obj);
 
         spin_unlock(&filp->table_lock);
 
@@ -665,7 +659,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
         if (!drm_core_check_feature(dev, DRIVER_GEM))
                 return -ENODEV;
 
-        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        obj = drm_gem_object_lookup(file_priv, args->handle);
         if (obj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c
index 1f500a1b9969..e1ab008b3f08 100644
--- a/drivers/gpu/drm/drm_gem_cma_helper.c
+++ b/drivers/gpu/drm/drm_gem_cma_helper.c
@@ -291,7 +291,7 @@ int drm_gem_cma_dumb_map_offset(struct drm_file *file_priv,
 {
         struct drm_gem_object *gem_obj;
 
-        gem_obj = drm_gem_object_lookup(drm, file_priv, handle);
+        gem_obj = drm_gem_object_lookup(file_priv, handle);
         if (!gem_obj) {
                 dev_err(drm->dev, "failed to lookup GEM object\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index df6cdc76a16e..aab0f3f1f42d 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -407,7 +407,7 @@ int drm_gem_prime_handle_to_fd(struct drm_device *dev,
         struct dma_buf *dmabuf;
 
         mutex_lock(&file_priv->prime.lock);
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj)  {
                 ret = -ENOENT;
                 goto out_unlock;
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index c2f92e362812..3d4f56df8359 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -314,7 +314,7 @@ static int etnaviv_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
         if (args->op & ~(ETNA_PREP_READ | ETNA_PREP_WRITE | ETNA_PREP_NOSYNC))
                 return -EINVAL;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -335,7 +335,7 @@ static int etnaviv_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
         if (args->flags)
                 return -EINVAL;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -356,7 +356,7 @@ static int etnaviv_ioctl_gem_info(struct drm_device *dev, void *data,
         if (args->pad)
                 return -EINVAL;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -441,7 +441,7 @@ static int etnaviv_ioctl_gem_wait(struct drm_device *dev, void *data,
         if (!gpu)
                 return -ENXIO;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index f851a40ac6cb..e0166403b4bd 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -152,8 +152,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
         int ret;
 
         for (i = 0; i < drm_format_num_planes(mode_cmd->pixel_format); i++) {
-                obj = drm_gem_object_lookup(dev, file_priv,
-                                            mode_cmd->handles[i]);
+                obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]);
                 if (!obj) {
                         DRM_ERROR("failed to lookup gem object\n");
                         ret = -ENOENT;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 72d9414bd944..cdf9f1af4347 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -177,7 +177,7 @@ unsigned long exynos_drm_gem_get_size(struct drm_device *dev,
         struct exynos_drm_gem *exynos_gem;
         struct drm_gem_object *obj;
 
-        obj = drm_gem_object_lookup(dev, file_priv, gem_handle);
+        obj = drm_gem_object_lookup(file_priv, gem_handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return 0;
@@ -296,7 +296,7 @@ dma_addr_t *exynos_drm_gem_get_dma_addr(struct drm_device *dev,
         struct exynos_drm_gem *exynos_gem;
         struct drm_gem_object *obj;
 
-        obj = drm_gem_object_lookup(dev, filp, gem_handle);
+        obj = drm_gem_object_lookup(filp, gem_handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return ERR_PTR(-EINVAL);
@@ -313,7 +313,7 @@ void exynos_drm_gem_put_dma_addr(struct drm_device *dev,
 {
         struct drm_gem_object *obj;
 
-        obj = drm_gem_object_lookup(dev, filp, gem_handle);
+        obj = drm_gem_object_lookup(filp, gem_handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return;
@@ -362,7 +362,7 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data,
         struct drm_exynos_gem_info *args = data;
         struct drm_gem_object *obj;
 
-        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return -EINVAL;
@@ -434,7 +434,7 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv,
          *      with DRM_IOCTL_MODE_MAP_DUMB command.
          */
 
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index ec2bc769742a..7440bf90ac9c 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -490,7 +490,7 @@ static struct drm_framebuffer *psb_user_framebuffer_create
          *      Find the GEM object and thus the gtt range object that is
          *      to back this space
          */
-        obj = drm_gem_object_lookup(dev, filp, cmd->handles[0]);
+        obj = drm_gem_object_lookup(filp, cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c
index 506224b3a0ad..6d1cb6b370b1 100644
--- a/drivers/gpu/drm/gma500/gem.c
+++ b/drivers/gpu/drm/gma500/gem.c
@@ -63,7 +63,7 @@ int psb_gem_dumb_map_gtt(struct drm_file *file, struct drm_device *dev,
         struct drm_gem_object *obj;
 
         /* GEM does all our handle to object mapping */
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 5bf765de2517..c95406e6f44d 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -372,7 +372,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 ret = -ENOENT;
                 goto unlock;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 261a3ef72828..cdd2f438d4b4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -695,7 +695,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -1049,7 +1049,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 goto put_rpm;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -1607,7 +1607,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -1655,7 +1655,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -1702,7 +1702,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
         if (args->flags & I915_MMAP_WC && !cpu_has_pat)
                 return -ENODEV;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (obj == NULL)
                 return -ENOENT;
 
@@ -2065,7 +2065,7 @@ i915_gem_mmap_gtt(struct drm_file *file,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -3140,7 +3140,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->bo_handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->bo_handle));
         if (&obj->base == NULL) {
                 mutex_unlock(&dev->struct_mutex);
                 return -ENOENT;
@@ -3934,7 +3934,7 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
         struct drm_i915_gem_caching *args = data;
         struct drm_i915_gem_object *obj;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL)
                 return -ENOENT;
 
@@ -3995,7 +3995,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 goto rpm_put;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -4365,7 +4365,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
@@ -4430,7 +4430,7 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
         if (ret)
                 return ret;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file_priv, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file_priv, args->handle));
         if (&obj->base == NULL) {
                 ret = -ENOENT;
                 goto unlock;
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 7410f6c962e7..b9bdb34032cd 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -166,7 +166,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
         struct drm_i915_gem_object *obj;
         int ret = 0;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL)
                 return -ENOENT;
 
@@ -297,7 +297,7 @@ i915_gem_get_tiling(struct drm_device *dev, void *data,
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct drm_i915_gem_object *obj;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
+        obj = to_intel_bo(drm_gem_object_lookup(file, args->handle));
         if (&obj->base == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a297e1ffafb5..86ee2aca040f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14883,8 +14883,7 @@ intel_user_framebuffer_create(struct drm_device *dev,
         struct drm_i915_gem_object *obj;
         struct drm_mode_fb_cmd2 mode_cmd = *user_mode_cmd;
 
-        obj = to_intel_bo(drm_gem_object_lookup(dev, filp,
-                                                mode_cmd.handles[0]));
+        obj = to_intel_bo(drm_gem_object_lookup(filp, mode_cmd.handles[0]));
         if (&obj->base == NULL)
                 return ERR_PTR(-ENOENT);
 
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index bcc3b6a016d8..bd38e49f7334 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1127,7 +1127,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
         }
         crtc = to_intel_crtc(drmmode_crtc);
 
-        new_bo = to_intel_bo(drm_gem_object_lookup(dev, file_priv,
+        new_bo = to_intel_bo(drm_gem_object_lookup(file_priv,
                                                    put_image_rec->bo_handle));
         if (&new_bo->base == NULL) {
                 ret = -ENOENT;
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
index a7bf6a90eae5..2ac3fcbfea7b 100644
--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
+++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
@@ -75,7 +75,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
                 return 0;
         }
 
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index 9147444d5bf2..615cbb08ba29 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -53,7 +53,7 @@ mgag200_user_framebuffer_create(struct drm_device *dev,
         struct mga_framebuffer *mga_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
@@ -358,7 +358,7 @@ mgag200_dumb_mmap_offset(struct drm_file *file,
         struct drm_gem_object *obj;
         struct mgag200_bo *bo;
 
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
index 3a48889dd9e5..9527dafc3e69 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
@@ -427,7 +427,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc,
         }
 
         if (handle) {
-                cursor_bo = drm_gem_object_lookup(dev, file_priv, handle);
+                cursor_bo = drm_gem_object_lookup(file_priv, handle);
                 if (!cursor_bo)
                         return -ENOENT;
         } else {
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
index ce779d956d57..88fe256c1931 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
@@ -518,7 +518,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,
                 goto set_cursor;
         }
 
-        cursor_bo = drm_gem_object_lookup(dev, file, handle);
+        cursor_bo = drm_gem_object_lookup(file, handle);
         if (!cursor_bo)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 9788989ea21c..9c654092ef78 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -622,7 +622,7 @@ static int msm_ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -640,7 +640,7 @@ static int msm_ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
         struct drm_gem_object *obj;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -661,7 +661,7 @@ static int msm_ioctl_gem_info(struct drm_device *dev, void *data,
         if (args->pad)
                 return -EINVAL;
 
-        obj = drm_gem_object_lookup(dev, file, args->handle);
+        obj = drm_gem_object_lookup(file, args->handle);
         if (!obj)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
index 17e0c9eb1900..461dc8b873f0 100644
--- a/drivers/gpu/drm/msm/msm_fb.c
+++ b/drivers/gpu/drm/msm/msm_fb.c
@@ -145,8 +145,7 @@ struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
         int ret, i, n = drm_format_num_planes(mode_cmd->pixel_format);
 
         for (i = 0; i < n; i++) {
-                bos[i] = drm_gem_object_lookup(dev, file,
-                                mode_cmd->handles[i]);
+                bos[i] = drm_gem_object_lookup(file, mode_cmd->handles[i]);
                 if (!bos[i]) {
                         ret = -ENXIO;
                         goto out_unref;
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index 9bbe1c5e7151..7daf4054dd2b 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -374,7 +374,7 @@ int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
         int ret = 0;
 
         /* GEM does all our handle to object mapping */
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL) {
                 ret = -ENOENT;
                 goto fail;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 55ccbf006b5e..ef9a3299f716 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -995,7 +995,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
         if (width != 64 || height != 64)
                 return -EINVAL;
 
-        gem = drm_gem_object_lookup(dev, file_priv, buffer_handle);
+        gem = drm_gem_object_lookup(file_priv, buffer_handle);
         if (!gem)
                 return -ENOENT;
         cursor = nouveau_gem_object(gem);
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index cf6e6171b428..7c77f960c8b8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -279,7 +279,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
         struct drm_gem_object *gem;
         int ret = -ENOMEM;
 
-        gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        gem = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (!gem)
                 return ERR_PTR(-ENOENT);
 
@@ -916,7 +916,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv,
 {
         struct drm_gem_object *gem;
 
-        gem = drm_gem_object_lookup(dev, file_priv, handle);
+        gem = drm_gem_object_lookup(file_priv, handle);
         if (gem) {
                 struct nouveau_bo *bo = nouveau_gem_object(gem);
                 *poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 185aaaa0c85d..445a9e2fb91a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -388,7 +388,7 @@ retry:
                 struct drm_gem_object *gem;
                 struct nouveau_bo *nvbo;
 
-                gem = drm_gem_object_lookup(dev, file_priv, b->handle);
+                gem = drm_gem_object_lookup(file_priv, b->handle);
                 if (!gem) {
                         NV_PRINTK(err, cli, "Unknown handle 0x%08x\n", b->handle);
                         ret = -ENOENT;
@@ -864,7 +864,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
         bool write = !!(req->flags & NOUVEAU_GEM_CPU_PREP_WRITE);
         int ret;
 
-        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
+        gem = drm_gem_object_lookup(file_priv, req->handle);
         if (!gem)
                 return -ENOENT;
         nvbo = nouveau_gem_object(gem);
@@ -896,7 +896,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data,
         struct drm_gem_object *gem;
         struct nouveau_bo *nvbo;
 
-        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
+        gem = drm_gem_object_lookup(file_priv, req->handle);
         if (!gem)
                 return -ENOENT;
         nvbo = nouveau_gem_object(gem);
@@ -914,7 +914,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data,
         struct drm_gem_object *gem;
         int ret;
 
-        gem = drm_gem_object_lookup(dev, file_priv, req->handle);
+        gem = drm_gem_object_lookup(file_priv, req->handle);
         if (!gem)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index a43445caae60..47761a92926e 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1314,7 +1314,7 @@ nv50_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
                 if (width != 64 || height != 64)
                         return -EINVAL;
 
-                gem = drm_gem_object_lookup(dev, file_priv, handle);
+                gem = drm_gem_object_lookup(file_priv, handle);
                 if (unlikely(!gem))
                         return -ENOENT;
                 nvbo = nouveau_gem_object(gem);
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index fe794980f1c8..d86f5479345b 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -561,7 +561,7 @@ static int ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
 
         VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op);
 
-        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -584,7 +584,7 @@ static int ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
 
         VERB("%p:%p: handle=%d", dev, file_priv, args->handle);
 
-        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!obj)
                 return -ENOENT;
 
@@ -608,7 +608,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
 
         VERB("%p:%p: handle=%d", dev, file_priv, args->handle);
 
-        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!obj)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index 0fbe17d0ec6f..3f823c368912 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -257,14 +257,14 @@ struct omap_dss_device *omap_encoder_get_dssdev(struct drm_encoder *encoder);
 /* should these be made into common util helpers?
  */
 
-static inline int objects_lookup(struct drm_device *dev,
+static inline int objects_lookup(
                 struct drm_file *filp, uint32_t pixel_format,
                 struct drm_gem_object **bos, const uint32_t *handles)
 {
         int i, n = drm_format_num_planes(pixel_format);
 
         for (i = 0; i < n; i++) {
-                bos[i] = drm_gem_object_lookup(dev, filp, handles[i]);
+                bos[i] = drm_gem_object_lookup(filp, handles[i]);
                 if (!bos[i])
                         goto fail;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_fb.c b/drivers/gpu/drm/omapdrm/omap_fb.c
index 610962396eb0..94ec06d3d737 100644
--- a/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@ -378,7 +378,7 @@ struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
         struct drm_framebuffer *fb;
         int ret;
 
-        ret = objects_lookup(dev, file, mode_cmd->pixel_format,
+        ret = objects_lookup(file, mode_cmd->pixel_format,
                         bos, mode_cmd->handles);
         if (ret)
                 return ERR_PTR(ret);
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 907154f5b67c..b97afc281778 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -687,7 +687,7 @@ int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
         int ret = 0;
 
         /* GEM does all our handle to object mapping */
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL) {
                 ret = -ENOENT;
                 goto fail;
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 9a035243faa6..8b5d54385892 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -318,7 +318,7 @@ static int qxl_crtc_cursor_set2(struct drm_crtc *crtc,
         if (!handle)
                 return qxl_hide_cursor(qdev);
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("cannot find cursor object\n");
                 return -ENOENT;
@@ -994,7 +994,9 @@ qxl_user_framebuffer_create(struct drm_device *dev,
         struct qxl_framebuffer *qxl_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
+        if (!obj)
+                return NULL;
 
         qxl_fb = kzalloc(sizeof(*qxl_fb), GFP_KERNEL);
         if (qxl_fb == NULL)
diff --git a/drivers/gpu/drm/qxl/qxl_dumb.c b/drivers/gpu/drm/qxl/qxl_dumb.c
index d34bb4130ff0..5e65d5d2d937 100644
--- a/drivers/gpu/drm/qxl/qxl_dumb.c
+++ b/drivers/gpu/drm/qxl/qxl_dumb.c
@@ -76,7 +76,7 @@ int qxl_mode_dumb_mmap(struct drm_file *file_priv,
         struct qxl_bo *qobj;
 
         BUG_ON(!offset_p);
-        gobj = drm_gem_object_lookup(dev, file_priv, handle);
+        gobj = drm_gem_object_lookup(file_priv, handle);
         if (gobj == NULL)
                 return -ENOENT;
         qobj = gem_to_qxl_bo(gobj);
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
index 7c2e78201ead..5a4c8c492683 100644
--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
@@ -107,15 +107,14 @@ apply_surf_reloc(struct qxl_device *qdev, struct qxl_reloc_info *info)
 }
 
 /* return holding the reference to this object */
-static int qxlhw_handle_to_bo(struct qxl_device *qdev,
-                              struct drm_file *file_priv, uint64_t handle,
+static int qxlhw_handle_to_bo(struct drm_file *file_priv, uint64_t handle,
                               struct qxl_release *release, struct qxl_bo **qbo_p)
 {
         struct drm_gem_object *gobj;
         struct qxl_bo *qobj;
         int ret;
 
-        gobj = drm_gem_object_lookup(qdev->ddev, file_priv, handle);
+        gobj = drm_gem_object_lookup(file_priv, handle);
         if (!gobj)
                 return -EINVAL;
 
@@ -221,7 +220,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
                 reloc_info[i].type = reloc.reloc_type;
 
                 if (reloc.dst_handle) {
-                        ret = qxlhw_handle_to_bo(qdev, file_priv, reloc.dst_handle, release,
+                        ret = qxlhw_handle_to_bo(file_priv, reloc.dst_handle, release,
                                                  &reloc_info[i].dst_bo);
                         if (ret)
                                 goto out_free_bos;
@@ -234,7 +233,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
 
                 /* reserve and validate the reloc dst bo */
                 if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle) {
-                        ret = qxlhw_handle_to_bo(qdev, file_priv, reloc.src_handle, release,
+                        ret = qxlhw_handle_to_bo(file_priv, reloc.src_handle, release,
                                                  &reloc_info[i].src_bo);
                         if (ret)
                                 goto out_free_bos;
@@ -314,7 +313,7 @@ static int qxl_update_area_ioctl(struct drm_device *dev, void *data,
             update_area->top >= update_area->bottom)
                 return -EINVAL;
 
-        gobj = drm_gem_object_lookup(dev, file, update_area->handle);
+        gobj = drm_gem_object_lookup(file, update_area->handle);
         if (gobj == NULL)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index ab39b85e0f76..271652963fa1 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -101,7 +101,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                 unsigned priority;
 
                 r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4];
-                gobj = drm_gem_object_lookup(ddev, p->filp, r->handle);
+                gobj = drm_gem_object_lookup(p->filp, r->handle);
                 if (gobj == NULL) {
                         DRM_ERROR("gem object lookup failed 0x%x\n",
                                   r->handle);
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
index afaf346bd50e..2a10e24b34b1 100644
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
@@ -274,7 +274,7 @@ int radeon_crtc_cursor_set2(struct drm_crtc *crtc,
                 return -EINVAL;
         }
 
-        obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, radeon_crtc->crtc_id);
                 return -ENOENT;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 628eb878a069..6a41b4982647 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1368,7 +1368,7 @@ radeon_user_framebuffer_create(struct drm_device *dev,
         struct radeon_framebuffer *radeon_fb;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (obj ==  NULL) {
                 dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
                         "can't create framebuffer\n", mode_cmd->handles[0]);
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index e26c963f2e93..deb9511725c9 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -382,7 +382,7 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
         down_read(&rdev->exclusive_lock);
 
         /* just do a BO wait for now */
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 up_read(&rdev->exclusive_lock);
                 return -ENOENT;
@@ -404,7 +404,7 @@ int radeon_mode_dumb_mmap(struct drm_file *filp,
         struct drm_gem_object *gobj;
         struct radeon_bo *robj;
 
-        gobj = drm_gem_object_lookup(dev, filp, handle);
+        gobj = drm_gem_object_lookup(filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -435,7 +435,7 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
         int r;
         uint32_t cur_placement = 0;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -464,7 +464,7 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         uint32_t cur_placement = 0;
         long ret;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
@@ -495,7 +495,7 @@ int radeon_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
         int r = 0;
 
         DRM_DEBUG("%d \n", args->handle);
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         robj = gem_to_radeon_bo(gobj);
@@ -513,7 +513,7 @@ int radeon_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
         int r = 0;
 
         DRM_DEBUG("\n");
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
         rbo = gem_to_radeon_bo(gobj);
@@ -648,7 +648,7 @@ int radeon_gem_va_ioctl(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 args->operation = RADEON_VA_RESULT_ERROR;
                 return -ENOENT;
@@ -703,7 +703,7 @@ int radeon_gem_op_ioctl(struct drm_device *dev, void *data,
         struct radeon_bo *robj;
         int r;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(filp, args->handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 8c10163a95bc..755cfdba61cd 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -123,8 +123,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                 unsigned int height = mode_cmd->height / (i ? vsub : 1);
                 unsigned int min_size;
 
-                obj = drm_gem_object_lookup(dev, file_priv,
-                                            mode_cmd->handles[i]);
+                obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]);
                 if (!obj) {
                         dev_err(dev->dev, "Failed to lookup GEM object\n");
                         ret = -ENXIO;
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 18e07338c6e5..9c2d8a894093 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -198,7 +198,7 @@ int rockchip_gem_dumb_map_offset(struct drm_file *file_priv,
         struct drm_gem_object *obj;
         int ret;
 
-        obj = drm_gem_object_lookup(dev, file_priv, handle);
+        obj = drm_gem_object_lookup(file_priv, handle);
         if (!obj) {
                 DRM_ERROR("failed to lookup gem object.\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 45deb8fd8e7c..679905544181 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -268,12 +268,12 @@ static void tegra_drm_lastclose(struct drm_device *drm)
 }
 
 static struct host1x_bo *
-host1x_bo_lookup(struct drm_device *drm, struct drm_file *file, u32 handle)
+host1x_bo_lookup(struct drm_file *file, u32 handle)
 {
         struct drm_gem_object *gem;
         struct tegra_bo *bo;
 
-        gem = drm_gem_object_lookup(drm, file, handle);
+        gem = drm_gem_object_lookup(file, handle);
         if (!gem)
                 return NULL;
 
@@ -311,11 +311,11 @@ static int host1x_reloc_copy_from_user(struct host1x_reloc *dest,
         if (err < 0)
                 return err;
 
-        dest->cmdbuf.bo = host1x_bo_lookup(drm, file, cmdbuf);
+        dest->cmdbuf.bo = host1x_bo_lookup(file, cmdbuf);
         if (!dest->cmdbuf.bo)
                 return -ENOENT;
 
-        dest->target.bo = host1x_bo_lookup(drm, file, target);
+        dest->target.bo = host1x_bo_lookup(file, target);
         if (!dest->target.bo)
                 return -ENOENT;
 
@@ -363,7 +363,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
                         goto fail;
                 }
 
-                bo = host1x_bo_lookup(drm, file, cmdbuf.handle);
+                bo = host1x_bo_lookup(file, cmdbuf.handle);
                 if (!bo) {
                         err = -ENOENT;
                         goto fail;
@@ -463,7 +463,7 @@ static int tegra_gem_mmap(struct drm_device *drm, void *data,
         struct drm_gem_object *gem;
         struct tegra_bo *bo;
 
-        gem = drm_gem_object_lookup(drm, file, args->handle);
+        gem = drm_gem_object_lookup(file, args->handle);
         if (!gem)
                 return -EINVAL;
 
@@ -672,7 +672,7 @@ static int tegra_gem_set_tiling(struct drm_device *drm, void *data,
                 return -EINVAL;
         }
 
-        gem = drm_gem_object_lookup(drm, file, args->handle);
+        gem = drm_gem_object_lookup(file, args->handle);
         if (!gem)
                 return -ENOENT;
 
@@ -694,7 +694,7 @@ static int tegra_gem_get_tiling(struct drm_device *drm, void *data,
         struct tegra_bo *bo;
         int err = 0;
 
-        gem = drm_gem_object_lookup(drm, file, args->handle);
+        gem = drm_gem_object_lookup(file, args->handle);
         if (!gem)
                 return -ENOENT;
 
@@ -736,7 +736,7 @@ static int tegra_gem_set_flags(struct drm_device *drm, void *data,
         if (args->flags & ~DRM_TEGRA_GEM_FLAGS)
                 return -EINVAL;
 
-        gem = drm_gem_object_lookup(drm, file, args->handle);
+        gem = drm_gem_object_lookup(file, args->handle);
         if (!gem)
                 return -ENOENT;
 
@@ -758,7 +758,7 @@ static int tegra_gem_get_flags(struct drm_device *drm, void *data,
         struct drm_gem_object *gem;
         struct tegra_bo *bo;
 
-        gem = drm_gem_object_lookup(drm, file, args->handle);
+        gem = drm_gem_object_lookup(file, args->handle);
         if (!gem)
                 return -ENOENT;
 
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index ca84de9ccb51..1b12aa7a715e 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -149,7 +149,7 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
                 unsigned int height = cmd->height / (i ? vsub : 1);
                 unsigned int size, bpp;
 
-                gem = drm_gem_object_lookup(drm, file, cmd->handles[i]);
+                gem = drm_gem_object_lookup(file, cmd->handles[i]);
                 if (!gem) {
                         err = -ENXIO;
                         goto unreference;
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 3b0d8c392b70..aa60d9909ea2 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -401,7 +401,7 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
         struct drm_gem_object *gem;
         struct tegra_bo *bo;
 
-        gem = drm_gem_object_lookup(drm, file, handle);
+        gem = drm_gem_object_lookup(file, handle);
         if (!gem) {
                 dev_err(drm->dev, "failed to lookup GEM object\n");
                 return -EINVAL;
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 4a9b43217900..d5df555aeba0 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -500,7 +500,7 @@ udl_fb_user_fb_create(struct drm_device *dev,
         int ret;
         uint32_t size;
 
-        obj = drm_gem_object_lookup(dev, file, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file, mode_cmd->handles[0]);
         if (obj == NULL)
                 return ERR_PTR(-ENOENT);
 
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c
index d7528e0d8442..818e70712b18 100644
--- a/drivers/gpu/drm/udl/udl_gem.c
+++ b/drivers/gpu/drm/udl/udl_gem.c
@@ -217,7 +217,7 @@ int udl_gem_mmap(struct drm_file *file, struct drm_device *dev,
         int ret = 0;
 
         mutex_lock(&dev->struct_mutex);
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (obj == NULL) {
                 ret = -ENOENT;
                 goto unlock;
diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c
index 9807bc9d296e..e5a9d3aaf45f 100644
--- a/drivers/gpu/drm/vc4/vc4_bo.c
+++ b/drivers/gpu/drm/vc4/vc4_bo.c
@@ -457,7 +457,7 @@ int vc4_mmap_bo_ioctl(struct drm_device *dev, void *data,
         struct drm_vc4_mmap_bo *args = data;
         struct drm_gem_object *gem_obj;
 
-        gem_obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        gem_obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!gem_obj) {
                 DRM_ERROR("Failed to look up GEM BO %d\n", args->handle);
                 return -EINVAL;
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 8d4384f8b78d..46899d6de675 100644
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -822,7 +822,7 @@ vc4_wait_bo_ioctl(struct drm_device *dev, void *data,
         if (args->pad != 0)
                 return -EINVAL;
 
-        gem_obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        gem_obj = drm_gem_object_lookup(file_priv, args->handle);
         if (!gem_obj) {
                 DRM_ERROR("Failed to look up GEM BO %d\n", args->handle);
                 return -EINVAL;
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index ae4de36d1d83..341f9be3dde6 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -200,7 +200,7 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev,
         int ret = 0;
         struct drm_gem_object *obj;
 
-        obj = drm_gem_object_lookup(dev, file, handle);
+        obj = drm_gem_object_lookup(file, handle);
         if (!obj)
                 return -ENOENT;
 
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,
         }
 
         /* lookup the cursor */
-        gobj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+        gobj = drm_gem_object_lookup(file_priv, handle);
         if (gobj == NULL)
                 return -ENOENT;
 
@@ -447,7 +447,7 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
         int ret;
 
         /* lookup object associated with res handle */
-        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]);
         if (!obj)
                 return ERR_PTR(-EINVAL);
 
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,
         struct drm_gem_object *gobj;
         struct virtio_gpu_object *obj;
         BUG_ON(!offset_p);
-        gobj = drm_gem_object_lookup(dev, file_priv, handle);
+        gobj = drm_gem_object_lookup(file_priv, handle);
         if (gobj == NULL)
                 return -ENOENT;
         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,
                 }
 
                 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;