Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Chris Wilson and committed by
Daniel Vetter
a8ad0bd8 99ee8729

+134 -147
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
··· 106 106 struct amdgpu_bo *bo; 107 107 struct mm_struct *usermm; 108 108 109 - gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); 109 + gobj = drm_gem_object_lookup(filp, info[i].bo_handle); 110 110 if (!gobj) { 111 111 r = -ENOENT; 112 112 goto error_free;
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
··· 92 92 { 93 93 struct drm_gem_object *gobj; 94 94 95 - gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, 96 - data->handle); 95 + gobj = drm_gem_object_lookup(p->filp, data->handle); 97 96 if (gobj == NULL) 98 97 return -EINVAL; 99 98
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
··· 563 563 struct amdgpu_framebuffer *amdgpu_fb; 564 564 int ret; 565 565 566 - obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); 566 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); 567 567 if (obj == NULL) { 568 568 dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " 569 569 "can't create framebuffer\n", mode_cmd->handles[0]);
+5 -5
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
··· 338 338 struct drm_gem_object *gobj; 339 339 struct amdgpu_bo *robj; 340 340 341 - gobj = drm_gem_object_lookup(dev, filp, handle); 341 + gobj = drm_gem_object_lookup(filp, handle); 342 342 if (gobj == NULL) { 343 343 return -ENOENT; 344 344 } ··· 402 402 int r = 0; 403 403 long ret; 404 404 405 - gobj = drm_gem_object_lookup(dev, filp, handle); 405 + gobj = drm_gem_object_lookup(filp, handle); 406 406 if (gobj == NULL) { 407 407 return -ENOENT; 408 408 } ··· 436 436 int r = -1; 437 437 438 438 DRM_DEBUG("%d \n", args->handle); 439 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 439 + gobj = drm_gem_object_lookup(filp, args->handle); 440 440 if (gobj == NULL) 441 441 return -ENOENT; 442 442 robj = gem_to_amdgpu_bo(gobj); ··· 584 584 return -EINVAL; 585 585 } 586 586 587 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 587 + gobj = drm_gem_object_lookup(filp, args->handle); 588 588 if (gobj == NULL) 589 589 return -ENOENT; 590 590 rbo = gem_to_amdgpu_bo(gobj); ··· 646 646 struct amdgpu_bo *robj; 647 647 int r; 648 648 649 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 649 + gobj = drm_gem_object_lookup(filp, args->handle); 650 650 if (gobj == NULL) { 651 651 return -ENOENT; 652 652 }
+1 -1
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2594 2594 return -EINVAL; 2595 2595 } 2596 2596 2597 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 2597 + obj = drm_gem_object_lookup(file_priv, handle); 2598 2598 if (!obj) { 2599 2599 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); 2600 2600 return -ENOENT;
+1 -1
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2605 2605 return -EINVAL; 2606 2606 } 2607 2607 2608 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 2608 + obj = drm_gem_object_lookup(file_priv, handle); 2609 2609 if (!obj) { 2610 2610 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); 2611 2611 return -ENOENT;
+1 -1
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2501 2501 return -EINVAL; 2502 2502 } 2503 2503 2504 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 2504 + obj = drm_gem_object_lookup(file_priv, handle); 2505 2505 if (!obj) { 2506 2506 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); 2507 2507 return -ENOENT;
+1 -1
drivers/gpu/drm/armada/armada_crtc.c
··· 911 911 if (w > 64 || h > 64 || (w > 32 && h > 32)) 912 912 return -ENOMEM; 913 913 914 - obj = armada_gem_object_lookup(dev, file, handle); 914 + obj = armada_gem_object_lookup(file, handle); 915 915 if (!obj) 916 916 return -ENOENT; 917 917
+1 -1
drivers/gpu/drm/armada/armada_fb.c
··· 120 120 goto err; 121 121 } 122 122 123 - obj = armada_gem_object_lookup(dev, dfile, mode->handles[0]); 123 + obj = armada_gem_object_lookup(dfile, mode->handles[0]); 124 124 if (!obj) { 125 125 ret = -ENOENT; 126 126 goto err;
+3 -3
drivers/gpu/drm/armada/armada_gem.c
··· 278 278 struct armada_gem_object *obj; 279 279 int ret = 0; 280 280 281 - obj = armada_gem_object_lookup(dev, file, handle); 281 + obj = armada_gem_object_lookup(file, handle); 282 282 if (!obj) { 283 283 DRM_ERROR("failed to lookup gem object\n"); 284 284 return -EINVAL; ··· 348 348 struct armada_gem_object *dobj; 349 349 unsigned long addr; 350 350 351 - dobj = armada_gem_object_lookup(dev, file, args->handle); 351 + dobj = armada_gem_object_lookup(file, args->handle); 352 352 if (dobj == NULL) 353 353 return -ENOENT; 354 354 ··· 391 391 if (ret) 392 392 return ret; 393 393 394 - dobj = armada_gem_object_lookup(dev, file, args->handle); 394 + dobj = armada_gem_object_lookup(file, args->handle); 395 395 if (dobj == NULL) 396 396 return -ENOENT; 397 397
+2 -2
drivers/gpu/drm/armada/armada_gem.h
··· 45 45 int armada_gem_map_import(struct armada_gem_object *); 46 46 47 47 static inline struct armada_gem_object *armada_gem_object_lookup( 48 - struct drm_device *dev, struct drm_file *dfile, unsigned handle) 48 + struct drm_file *dfile, unsigned handle) 49 49 { 50 - struct drm_gem_object *obj = drm_gem_object_lookup(dev, dfile, handle); 50 + struct drm_gem_object *obj = drm_gem_object_lookup(dfile, handle); 51 51 52 52 return obj ? drm_to_armada_gem(obj) : NULL; 53 53 }
+2 -2
drivers/gpu/drm/ast/ast_main.c
··· 333 333 struct ast_framebuffer *ast_fb; 334 334 int ret; 335 335 336 - obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]); 336 + obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); 337 337 if (obj == NULL) 338 338 return ERR_PTR(-ENOENT); 339 339 ··· 574 574 struct drm_gem_object *obj; 575 575 struct ast_bo *bo; 576 576 577 - obj = drm_gem_object_lookup(dev, file, handle); 577 + obj = drm_gem_object_lookup(file, handle); 578 578 if (obj == NULL) 579 579 return -ENOENT; 580 580
+1 -1
drivers/gpu/drm/ast/ast_mode.c
··· 1141 1141 if (width > AST_MAX_HWC_WIDTH || height > AST_MAX_HWC_HEIGHT) 1142 1142 return -EINVAL; 1143 1143 1144 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 1144 + obj = drm_gem_object_lookup(file_priv, handle); 1145 1145 if (!obj) { 1146 1146 DRM_ERROR("Cannot find cursor object %x for crtc\n", handle); 1147 1147 return -ENOENT;
+2 -2
drivers/gpu/drm/bochs/bochs_mm.c
··· 458 458 struct drm_gem_object *obj; 459 459 struct bochs_bo *bo; 460 460 461 - obj = drm_gem_object_lookup(dev, file, handle); 461 + obj = drm_gem_object_lookup(file, handle); 462 462 if (obj == NULL) 463 463 return -ENOENT; 464 464 ··· 520 520 if (mode_cmd->pixel_format != DRM_FORMAT_XRGB8888) 521 521 return ERR_PTR(-ENOENT); 522 522 523 - obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]); 523 + obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); 524 524 if (obj == NULL) 525 525 return ERR_PTR(-ENOENT); 526 526
+2 -2
drivers/gpu/drm/cirrus/cirrus_main.c
··· 61 61 bpp, mode_cmd->pitches[0])) 62 62 return ERR_PTR(-EINVAL); 63 63 64 - obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]); 64 + obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); 65 65 if (obj == NULL) 66 66 return ERR_PTR(-ENOENT); 67 67 ··· 295 295 struct drm_gem_object *obj; 296 296 struct cirrus_bo *bo; 297 297 298 - obj = drm_gem_object_lookup(dev, file, handle); 298 + obj = drm_gem_object_lookup(file, handle); 299 299 if (obj == NULL) 300 300 return -ENOENT; 301 301
+1 -1
drivers/gpu/drm/drm_fb_cma_helper.c
··· 183 183 unsigned int height = mode_cmd->height / (i ? vsub : 1); 184 184 unsigned int min_size; 185 185 186 - obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[i]); 186 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]); 187 187 if (!obj) { 188 188 dev_err(dev->dev, "Failed to lookup GEM object\n"); 189 189 ret = -ENXIO;
+4 -10
drivers/gpu/drm/drm_gem.c
··· 588 588 589 589 /** 590 590 * drm_gem_object_lookup - look up a GEM object from it's handle 591 - * @dev: DRM device 592 591 * @filp: DRM file private date 593 592 * @handle: userspace handle 594 593 * ··· 597 598 * otherwise. 598 599 */ 599 600 struct drm_gem_object * 600 - drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp, 601 - u32 handle) 601 + drm_gem_object_lookup(struct drm_file *filp, u32 handle) 602 602 { 603 603 struct drm_gem_object *obj; 604 604 ··· 605 607 606 608 /* Check if we currently have a reference on the object */ 607 609 obj = idr_find(&filp->object_idr, handle); 608 - if (obj == NULL) { 609 - spin_unlock(&filp->table_lock); 610 - return NULL; 611 - } 612 - 613 - drm_gem_object_reference(obj); 610 + if (obj) 611 + drm_gem_object_reference(obj); 614 612 615 613 spin_unlock(&filp->table_lock); 616 614 ··· 659 665 if (!drm_core_check_feature(dev, DRIVER_GEM)) 660 666 return -ENODEV; 661 667 662 - obj = drm_gem_object_lookup(dev, file_priv, args->handle); 668 + obj = drm_gem_object_lookup(file_priv, args->handle); 663 669 if (obj == NULL) 664 670 return -ENOENT; 665 671
+1 -1
drivers/gpu/drm/drm_gem_cma_helper.c
··· 291 291 { 292 292 struct drm_gem_object *gem_obj; 293 293 294 - gem_obj = drm_gem_object_lookup(drm, file_priv, handle); 294 + gem_obj = drm_gem_object_lookup(file_priv, handle); 295 295 if (!gem_obj) { 296 296 dev_err(drm->dev, "failed to lookup GEM object\n"); 297 297 return -EINVAL;
+1 -1
drivers/gpu/drm/drm_prime.c
··· 407 407 struct dma_buf *dmabuf; 408 408 409 409 mutex_lock(&file_priv->prime.lock); 410 - obj = drm_gem_object_lookup(dev, file_priv, handle); 410 + obj = drm_gem_object_lookup(file_priv, handle); 411 411 if (!obj) { 412 412 ret = -ENOENT; 413 413 goto out_unlock;
+4 -4
drivers/gpu/drm/etnaviv/etnaviv_drv.c
··· 314 314 if (args->op & ~(ETNA_PREP_READ | ETNA_PREP_WRITE | ETNA_PREP_NOSYNC)) 315 315 return -EINVAL; 316 316 317 - obj = drm_gem_object_lookup(dev, file, args->handle); 317 + obj = drm_gem_object_lookup(file, args->handle); 318 318 if (!obj) 319 319 return -ENOENT; 320 320 ··· 335 335 if (args->flags) 336 336 return -EINVAL; 337 337 338 - obj = drm_gem_object_lookup(dev, file, args->handle); 338 + obj = drm_gem_object_lookup(file, args->handle); 339 339 if (!obj) 340 340 return -ENOENT; 341 341 ··· 356 356 if (args->pad) 357 357 return -EINVAL; 358 358 359 - obj = drm_gem_object_lookup(dev, file, args->handle); 359 + obj = drm_gem_object_lookup(file, args->handle); 360 360 if (!obj) 361 361 return -ENOENT; 362 362 ··· 441 441 if (!gpu) 442 442 return -ENXIO; 443 443 444 - obj = drm_gem_object_lookup(dev, file, args->handle); 444 + obj = drm_gem_object_lookup(file, args->handle); 445 445 if (!obj) 446 446 return -ENOENT; 447 447
+1 -2
drivers/gpu/drm/exynos/exynos_drm_fb.c
··· 152 152 int ret; 153 153 154 154 for (i = 0; i < drm_format_num_planes(mode_cmd->pixel_format); i++) { 155 - obj = drm_gem_object_lookup(dev, file_priv, 156 - mode_cmd->handles[i]); 155 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]); 157 156 if (!obj) { 158 157 DRM_ERROR("failed to lookup gem object\n"); 159 158 ret = -ENOENT;
+5 -5
drivers/gpu/drm/exynos/exynos_drm_gem.c
··· 177 177 struct exynos_drm_gem *exynos_gem; 178 178 struct drm_gem_object *obj; 179 179 180 - obj = drm_gem_object_lookup(dev, file_priv, gem_handle); 180 + obj = drm_gem_object_lookup(file_priv, gem_handle); 181 181 if (!obj) { 182 182 DRM_ERROR("failed to lookup gem object.\n"); 183 183 return 0; ··· 296 296 struct exynos_drm_gem *exynos_gem; 297 297 struct drm_gem_object *obj; 298 298 299 - obj = drm_gem_object_lookup(dev, filp, gem_handle); 299 + obj = drm_gem_object_lookup(filp, gem_handle); 300 300 if (!obj) { 301 301 DRM_ERROR("failed to lookup gem object.\n"); 302 302 return ERR_PTR(-EINVAL); ··· 313 313 { 314 314 struct drm_gem_object *obj; 315 315 316 - obj = drm_gem_object_lookup(dev, filp, gem_handle); 316 + obj = drm_gem_object_lookup(filp, gem_handle); 317 317 if (!obj) { 318 318 DRM_ERROR("failed to lookup gem object.\n"); 319 319 return; ··· 362 362 struct drm_exynos_gem_info *args = data; 363 363 struct drm_gem_object *obj; 364 364 365 - obj = drm_gem_object_lookup(dev, file_priv, args->handle); 365 + obj = drm_gem_object_lookup(file_priv, args->handle); 366 366 if (!obj) { 367 367 DRM_ERROR("failed to lookup gem object.\n"); 368 368 return -EINVAL; ··· 434 434 * with DRM_IOCTL_MODE_MAP_DUMB command. 435 435 */ 436 436 437 - obj = drm_gem_object_lookup(dev, file_priv, handle); 437 + obj = drm_gem_object_lookup(file_priv, handle); 438 438 if (!obj) { 439 439 DRM_ERROR("failed to lookup gem object.\n"); 440 440 return -EINVAL;
+1 -1
drivers/gpu/drm/gma500/framebuffer.c
··· 490 490 * Find the GEM object and thus the gtt range object that is 491 491 * to back this space 492 492 */ 493 - obj = drm_gem_object_lookup(dev, filp, cmd->handles[0]); 493 + obj = drm_gem_object_lookup(filp, cmd->handles[0]); 494 494 if (obj == NULL) 495 495 return ERR_PTR(-ENOENT); 496 496
+1 -1
drivers/gpu/drm/gma500/gem.c
··· 63 63 struct drm_gem_object *obj; 64 64 65 65 /* GEM does all our handle to object mapping */ 66 - obj = drm_gem_object_lookup(dev, file, handle); 66 + obj = drm_gem_object_lookup(file, handle); 67 67 if (obj == NULL) 68 68 return -ENOENT; 69 69
+1 -1
drivers/gpu/drm/gma500/gma_display.c
··· 372 372 return -EINVAL; 373 373 } 374 374 375 - obj = drm_gem_object_lookup(dev, file_priv, handle); 375 + obj = drm_gem_object_lookup(file_priv, handle); 376 376 if (!obj) { 377 377 ret = -ENOENT; 378 378 goto unlock;
+11 -11
drivers/gpu/drm/i915/i915_gem.c
··· 695 695 if (ret) 696 696 return ret; 697 697 698 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 698 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 699 699 if (&obj->base == NULL) { 700 700 ret = -ENOENT; 701 701 goto unlock; ··· 1049 1049 if (ret) 1050 1050 goto put_rpm; 1051 1051 1052 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 1052 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 1053 1053 if (&obj->base == NULL) { 1054 1054 ret = -ENOENT; 1055 1055 goto unlock; ··· 1607 1607 if (ret) 1608 1608 return ret; 1609 1609 1610 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 1610 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 1611 1611 if (&obj->base == NULL) { 1612 1612 ret = -ENOENT; 1613 1613 goto unlock; ··· 1655 1655 if (ret) 1656 1656 return ret; 1657 1657 1658 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 1658 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 1659 1659 if (&obj->base == NULL) { 1660 1660 ret = -ENOENT; 1661 1661 goto unlock; ··· 1702 1702 if (args->flags & I915_MMAP_WC && !cpu_has_pat) 1703 1703 return -ENODEV; 1704 1704 1705 - obj = drm_gem_object_lookup(dev, file, args->handle); 1705 + obj = drm_gem_object_lookup(file, args->handle); 1706 1706 if (obj == NULL) 1707 1707 return -ENOENT; 1708 1708 ··· 2065 2065 if (ret) 2066 2066 return ret; 2067 2067 2068 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle)); 2068 + obj = to_intel_bo(drm_gem_object_lookup(file, handle)); 2069 2069 if (&obj->base == NULL) { 2070 2070 ret = -ENOENT; 2071 2071 goto unlock; ··· 3140 3140 if (ret) 3141 3141 return ret; 3142 3142 3143 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->bo_handle)); 3143 + obj = to_intel_bo(drm_gem_object_lookup(file, args->bo_handle)); 3144 3144 if (&obj->base == NULL) { 3145 3145 mutex_unlock(&dev->struct_mutex); 3146 3146 return -ENOENT; ··· 3934 3934 struct drm_i915_gem_caching *args = data; 3935 3935 struct drm_i915_gem_object *obj; 3936 3936 3937 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 3937 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 3938 3938 if (&obj->base == NULL) 3939 3939 return -ENOENT; 3940 3940 ··· 3995 3995 if (ret) 3996 3996 goto rpm_put; 3997 3997 3998 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 3998 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 3999 3999 if (&obj->base == NULL) { 4000 4000 ret = -ENOENT; 4001 4001 goto unlock; ··· 4365 4365 if (ret) 4366 4366 return ret; 4367 4367 4368 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 4368 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 4369 4369 if (&obj->base == NULL) { 4370 4370 ret = -ENOENT; 4371 4371 goto unlock; ··· 4430 4430 if (ret) 4431 4431 return ret; 4432 4432 4433 - obj = to_intel_bo(drm_gem_object_lookup(dev, file_priv, args->handle)); 4433 + obj = to_intel_bo(drm_gem_object_lookup(file_priv, args->handle)); 4434 4434 if (&obj->base == NULL) { 4435 4435 ret = -ENOENT; 4436 4436 goto unlock;
+2 -2
drivers/gpu/drm/i915/i915_gem_tiling.c
··· 166 166 struct drm_i915_gem_object *obj; 167 167 int ret = 0; 168 168 169 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 169 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 170 170 if (&obj->base == NULL) 171 171 return -ENOENT; 172 172 ··· 297 297 struct drm_i915_private *dev_priv = dev->dev_private; 298 298 struct drm_i915_gem_object *obj; 299 299 300 - obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); 300 + obj = to_intel_bo(drm_gem_object_lookup(file, args->handle)); 301 301 if (&obj->base == NULL) 302 302 return -ENOENT; 303 303
+1 -2
drivers/gpu/drm/i915/intel_display.c
··· 14883 14883 struct drm_i915_gem_object *obj; 14884 14884 struct drm_mode_fb_cmd2 mode_cmd = *user_mode_cmd; 14885 14885 14886 - obj = to_intel_bo(drm_gem_object_lookup(dev, filp, 14887 - mode_cmd.handles[0])); 14886 + obj = to_intel_bo(drm_gem_object_lookup(filp, mode_cmd.handles[0])); 14888 14887 if (&obj->base == NULL) 14889 14888 return ERR_PTR(-ENOENT); 14890 14889
+1 -1
drivers/gpu/drm/i915/intel_overlay.c
··· 1127 1127 } 1128 1128 crtc = to_intel_crtc(drmmode_crtc); 1129 1129 1130 - new_bo = to_intel_bo(drm_gem_object_lookup(dev, file_priv, 1130 + new_bo = to_intel_bo(drm_gem_object_lookup(file_priv, 1131 1131 put_image_rec->bo_handle)); 1132 1132 if (&new_bo->base == NULL) { 1133 1133 ret = -ENOENT;
+1 -1
drivers/gpu/drm/mgag200/mgag200_cursor.c
··· 75 75 return 0; 76 76 } 77 77 78 - obj = drm_gem_object_lookup(dev, file_priv, handle); 78 + obj = drm_gem_object_lookup(file_priv, handle); 79 79 if (!obj) 80 80 return -ENOENT; 81 81
+2 -2
drivers/gpu/drm/mgag200/mgag200_main.c
··· 53 53 struct mga_framebuffer *mga_fb; 54 54 int ret; 55 55 56 - obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]); 56 + obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); 57 57 if (obj == NULL) 58 58 return ERR_PTR(-ENOENT); 59 59 ··· 358 358 struct drm_gem_object *obj; 359 359 struct mgag200_bo *bo; 360 360 361 - obj = drm_gem_object_lookup(dev, file, handle); 361 + obj = drm_gem_object_lookup(file, handle); 362 362 if (obj == NULL) 363 363 return -ENOENT; 364 364
+1 -1
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
··· 427 427 } 428 428 429 429 if (handle) { 430 - cursor_bo = drm_gem_object_lookup(dev, file_priv, handle); 430 + cursor_bo = drm_gem_object_lookup(file_priv, handle); 431 431 if (!cursor_bo) 432 432 return -ENOENT; 433 433 } else {
+1 -1
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
··· 518 518 goto set_cursor; 519 519 } 520 520 521 - cursor_bo = drm_gem_object_lookup(dev, file, handle); 521 + cursor_bo = drm_gem_object_lookup(file, handle); 522 522 if (!cursor_bo) 523 523 return -ENOENT; 524 524
+3 -3
drivers/gpu/drm/msm/msm_drv.c
··· 622 622 return -EINVAL; 623 623 } 624 624 625 - obj = drm_gem_object_lookup(dev, file, args->handle); 625 + obj = drm_gem_object_lookup(file, args->handle); 626 626 if (!obj) 627 627 return -ENOENT; 628 628 ··· 640 640 struct drm_gem_object *obj; 641 641 int ret; 642 642 643 - obj = drm_gem_object_lookup(dev, file, args->handle); 643 + obj = drm_gem_object_lookup(file, args->handle); 644 644 if (!obj) 645 645 return -ENOENT; 646 646 ··· 661 661 if (args->pad) 662 662 return -EINVAL; 663 663 664 - obj = drm_gem_object_lookup(dev, file, args->handle); 664 + obj = drm_gem_object_lookup(file, args->handle); 665 665 if (!obj) 666 666 return -ENOENT; 667 667
+1 -2
drivers/gpu/drm/msm/msm_fb.c
··· 145 145 int ret, i, n = drm_format_num_planes(mode_cmd->pixel_format); 146 146 147 147 for (i = 0; i < n; i++) { 148 - bos[i] = drm_gem_object_lookup(dev, file, 149 - mode_cmd->handles[i]); 148 + bos[i] = drm_gem_object_lookup(file, mode_cmd->handles[i]); 150 149 if (!bos[i]) { 151 150 ret = -ENXIO; 152 151 goto out_unref;
+1 -1
drivers/gpu/drm/msm/msm_gem.c
··· 374 374 int ret = 0; 375 375 376 376 /* GEM does all our handle to object mapping */ 377 - obj = drm_gem_object_lookup(dev, file, handle); 377 + obj = drm_gem_object_lookup(file, handle); 378 378 if (obj == NULL) { 379 379 ret = -ENOENT; 380 380 goto fail;
+1 -1
drivers/gpu/drm/nouveau/dispnv04/crtc.c
··· 995 995 if (width != 64 || height != 64) 996 996 return -EINVAL; 997 997 998 - gem = drm_gem_object_lookup(dev, file_priv, buffer_handle); 998 + gem = drm_gem_object_lookup(file_priv, buffer_handle); 999 999 if (!gem) 1000 1000 return -ENOENT; 1001 1001 cursor = nouveau_gem_object(gem);
+2 -2
drivers/gpu/drm/nouveau/nouveau_display.c
··· 279 279 struct drm_gem_object *gem; 280 280 int ret = -ENOMEM; 281 281 282 - gem = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); 282 + gem = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); 283 283 if (!gem) 284 284 return ERR_PTR(-ENOENT); 285 285 ··· 916 916 { 917 917 struct drm_gem_object *gem; 918 918 919 - gem = drm_gem_object_lookup(dev, file_priv, handle); 919 + gem = drm_gem_object_lookup(file_priv, handle); 920 920 if (gem) { 921 921 struct nouveau_bo *bo = nouveau_gem_object(gem); 922 922 *poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);
+4 -4
drivers/gpu/drm/nouveau/nouveau_gem.c
··· 388 388 struct drm_gem_object *gem; 389 389 struct nouveau_bo *nvbo; 390 390 391 - gem = drm_gem_object_lookup(dev, file_priv, b->handle); 391 + gem = drm_gem_object_lookup(file_priv, b->handle); 392 392 if (!gem) { 393 393 NV_PRINTK(err, cli, "Unknown handle 0x%08x\n", b->handle); 394 394 ret = -ENOENT; ··· 864 864 bool write = !!(req->flags & NOUVEAU_GEM_CPU_PREP_WRITE); 865 865 int ret; 866 866 867 - gem = drm_gem_object_lookup(dev, file_priv, req->handle); 867 + gem = drm_gem_object_lookup(file_priv, req->handle); 868 868 if (!gem) 869 869 return -ENOENT; 870 870 nvbo = nouveau_gem_object(gem); ··· 896 896 struct drm_gem_object *gem; 897 897 struct nouveau_bo *nvbo; 898 898 899 - gem = drm_gem_object_lookup(dev, file_priv, req->handle); 899 + gem = drm_gem_object_lookup(file_priv, req->handle); 900 900 if (!gem) 901 901 return -ENOENT; 902 902 nvbo = nouveau_gem_object(gem); ··· 914 914 struct drm_gem_object *gem; 915 915 int ret; 916 916 917 - gem = drm_gem_object_lookup(dev, file_priv, req->handle); 917 + gem = drm_gem_object_lookup(file_priv, req->handle); 918 918 if (!gem) 919 919 return -ENOENT; 920 920
+1 -1
drivers/gpu/drm/nouveau/nv50_display.c
··· 1314 1314 if (width != 64 || height != 64) 1315 1315 return -EINVAL; 1316 1316 1317 - gem = drm_gem_object_lookup(dev, file_priv, handle); 1317 + gem = drm_gem_object_lookup(file_priv, handle); 1318 1318 if (unlikely(!gem)) 1319 1319 return -ENOENT; 1320 1320 nvbo = nouveau_gem_object(gem);
+3 -3
drivers/gpu/drm/omapdrm/omap_drv.c
··· 561 561 562 562 VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op); 563 563 564 - obj = drm_gem_object_lookup(dev, file_priv, args->handle); 564 + obj = drm_gem_object_lookup(file_priv, args->handle); 565 565 if (!obj) 566 566 return -ENOENT; 567 567 ··· 584 584 585 585 VERB("%p:%p: handle=%d", dev, file_priv, args->handle); 586 586 587 - obj = drm_gem_object_lookup(dev, file_priv, args->handle); 587 + obj = drm_gem_object_lookup(file_priv, args->handle); 588 588 if (!obj) 589 589 return -ENOENT; 590 590 ··· 608 608 609 609 VERB("%p:%p: handle=%d", dev, file_priv, args->handle); 610 610 611 - obj = drm_gem_object_lookup(dev, file_priv, args->handle); 611 + obj = drm_gem_object_lookup(file_priv, args->handle); 612 612 if (!obj) 613 613 return -ENOENT; 614 614
+2 -2
drivers/gpu/drm/omapdrm/omap_drv.h
··· 257 257 /* should these be made into common util helpers? 258 258 */ 259 259 260 - static inline int objects_lookup(struct drm_device *dev, 260 + static inline int objects_lookup( 261 261 struct drm_file *filp, uint32_t pixel_format, 262 262 struct drm_gem_object **bos, const uint32_t *handles) 263 263 { 264 264 int i, n = drm_format_num_planes(pixel_format); 265 265 266 266 for (i = 0; i < n; i++) { 267 - bos[i] = drm_gem_object_lookup(dev, filp, handles[i]); 267 + bos[i] = drm_gem_object_lookup(filp, handles[i]); 268 268 if (!bos[i]) 269 269 goto fail; 270 270
+1 -1
drivers/gpu/drm/omapdrm/omap_fb.c
··· 378 378 struct drm_framebuffer *fb; 379 379 int ret; 380 380 381 - ret = objects_lookup(dev, file, mode_cmd->pixel_format, 381 + ret = objects_lookup(file, mode_cmd->pixel_format, 382 382 bos, mode_cmd->handles); 383 383 if (ret) 384 384 return ERR_PTR(ret);
+1 -1
drivers/gpu/drm/omapdrm/omap_gem.c
··· 687 687 int ret = 0; 688 688 689 689 /* GEM does all our handle to object mapping */ 690 - obj = drm_gem_object_lookup(dev, file, handle); 690 + obj = drm_gem_object_lookup(file, handle); 691 691 if (obj == NULL) { 692 692 ret = -ENOENT; 693 693 goto fail;
+4 -2
drivers/gpu/drm/qxl/qxl_display.c
··· 318 318 if (!handle) 319 319 return qxl_hide_cursor(qdev); 320 320 321 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 321 + obj = drm_gem_object_lookup(file_priv, handle); 322 322 if (!obj) { 323 323 DRM_ERROR("cannot find cursor object\n"); 324 324 return -ENOENT; ··· 994 994 struct qxl_framebuffer *qxl_fb; 995 995 int ret; 996 996 997 - obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); 997 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); 998 + if (!obj) 999 + return NULL; 998 1000 999 1001 qxl_fb = kzalloc(sizeof(*qxl_fb), GFP_KERNEL); 1000 1002 if (qxl_fb == NULL)
+1 -1
drivers/gpu/drm/qxl/qxl_dumb.c
··· 76 76 struct qxl_bo *qobj; 77 77 78 78 BUG_ON(!offset_p); 79 - gobj = drm_gem_object_lookup(dev, file_priv, handle); 79 + gobj = drm_gem_object_lookup(file_priv, handle); 80 80 if (gobj == NULL) 81 81 return -ENOENT; 82 82 qobj = gem_to_qxl_bo(gobj);
+5 -6
drivers/gpu/drm/qxl/qxl_ioctl.c
··· 107 107 } 108 108 109 109 /* return holding the reference to this object */ 110 - static int qxlhw_handle_to_bo(struct qxl_device *qdev, 111 - struct drm_file *file_priv, uint64_t handle, 110 + static int qxlhw_handle_to_bo(struct drm_file *file_priv, uint64_t handle, 112 111 struct qxl_release *release, struct qxl_bo **qbo_p) 113 112 { 114 113 struct drm_gem_object *gobj; 115 114 struct qxl_bo *qobj; 116 115 int ret; 117 116 118 - gobj = drm_gem_object_lookup(qdev->ddev, file_priv, handle); 117 + gobj = drm_gem_object_lookup(file_priv, handle); 119 118 if (!gobj) 120 119 return -EINVAL; 121 120 ··· 220 221 reloc_info[i].type = reloc.reloc_type; 221 222 222 223 if (reloc.dst_handle) { 223 - ret = qxlhw_handle_to_bo(qdev, file_priv, reloc.dst_handle, release, 224 + ret = qxlhw_handle_to_bo(file_priv, reloc.dst_handle, release, 224 225 &reloc_info[i].dst_bo); 225 226 if (ret) 226 227 goto out_free_bos; ··· 233 234 234 235 /* reserve and validate the reloc dst bo */ 235 236 if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle) { 236 - ret = qxlhw_handle_to_bo(qdev, file_priv, reloc.src_handle, release, 237 + ret = qxlhw_handle_to_bo(file_priv, reloc.src_handle, release, 237 238 &reloc_info[i].src_bo); 238 239 if (ret) 239 240 goto out_free_bos; ··· 313 314 update_area->top >= update_area->bottom) 314 315 return -EINVAL; 315 316 316 - gobj = drm_gem_object_lookup(dev, file, update_area->handle); 317 + gobj = drm_gem_object_lookup(file, update_area->handle); 317 318 if (gobj == NULL) 318 319 return -ENOENT; 319 320
+1 -1
drivers/gpu/drm/radeon/radeon_cs.c
··· 101 101 unsigned priority; 102 102 103 103 r = (struct drm_radeon_cs_reloc *)&chunk->kdata[i*4]; 104 - gobj = drm_gem_object_lookup(ddev, p->filp, r->handle); 104 + gobj = drm_gem_object_lookup(p->filp, r->handle); 105 105 if (gobj == NULL) { 106 106 DRM_ERROR("gem object lookup failed 0x%x\n", 107 107 r->handle);
+1 -1
drivers/gpu/drm/radeon/radeon_cursor.c
··· 274 274 return -EINVAL; 275 275 } 276 276 277 - obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); 277 + obj = drm_gem_object_lookup(file_priv, handle); 278 278 if (!obj) { 279 279 DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, radeon_crtc->crtc_id); 280 280 return -ENOENT;
+1 -1
drivers/gpu/drm/radeon/radeon_display.c
··· 1368 1368 struct radeon_framebuffer *radeon_fb; 1369 1369 int ret; 1370 1370 1371 - obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); 1371 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[0]); 1372 1372 if (obj == NULL) { 1373 1373 dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " 1374 1374 "can't create framebuffer\n", mode_cmd->handles[0]);
+8 -8
drivers/gpu/drm/radeon/radeon_gem.c
··· 382 382 down_read(&rdev->exclusive_lock); 383 383 384 384 /* just do a BO wait for now */ 385 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 385 + gobj = drm_gem_object_lookup(filp, args->handle); 386 386 if (gobj == NULL) { 387 387 up_read(&rdev->exclusive_lock); 388 388 return -ENOENT; ··· 404 404 struct drm_gem_object *gobj; 405 405 struct radeon_bo *robj; 406 406 407 - gobj = drm_gem_object_lookup(dev, filp, handle); 407 + gobj = drm_gem_object_lookup(filp, handle); 408 408 if (gobj == NULL) { 409 409 return -ENOENT; 410 410 } ··· 435 435 int r; 436 436 uint32_t cur_placement = 0; 437 437 438 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 438 + gobj = drm_gem_object_lookup(filp, args->handle); 439 439 if (gobj == NULL) { 440 440 return -ENOENT; 441 441 } ··· 464 464 uint32_t cur_placement = 0; 465 465 long ret; 466 466 467 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 467 + gobj = drm_gem_object_lookup(filp, args->handle); 468 468 if (gobj == NULL) { 469 469 return -ENOENT; 470 470 } ··· 495 495 int r = 0; 496 496 497 497 DRM_DEBUG("%d \n", args->handle); 498 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 498 + gobj = drm_gem_object_lookup(filp, args->handle); 499 499 if (gobj == NULL) 500 500 return -ENOENT; 501 501 robj = gem_to_radeon_bo(gobj); ··· 513 513 int r = 0; 514 514 515 515 DRM_DEBUG("\n"); 516 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 516 + gobj = drm_gem_object_lookup(filp, args->handle); 517 517 if (gobj == NULL) 518 518 return -ENOENT; 519 519 rbo = gem_to_radeon_bo(gobj); ··· 648 648 return -EINVAL; 649 649 } 650 650 651 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 651 + gobj = drm_gem_object_lookup(filp, args->handle); 652 652 if (gobj == NULL) { 653 653 args->operation = RADEON_VA_RESULT_ERROR; 654 654 return -ENOENT; ··· 703 703 struct radeon_bo *robj; 704 704 int r; 705 705 706 - gobj = drm_gem_object_lookup(dev, filp, args->handle); 706 + gobj = drm_gem_object_lookup(filp, args->handle); 707 707 if (gobj == NULL) { 708 708 return -ENOENT; 709 709 }
+1 -2
drivers/gpu/drm/rockchip/rockchip_drm_fb.c
··· 123 123 unsigned int height = mode_cmd->height / (i ? vsub : 1); 124 124 unsigned int min_size; 125 125 126 - obj = drm_gem_object_lookup(dev, file_priv, 127 - mode_cmd->handles[i]); 126 + obj = drm_gem_object_lookup(file_priv, mode_cmd->handles[i]); 128 127 if (!obj) { 129 128 dev_err(dev->dev, "Failed to lookup GEM object\n"); 130 129 ret = -ENXIO;
+1 -1
drivers/gpu/drm/rockchip/rockchip_drm_gem.c
··· 198 198 struct drm_gem_object *obj; 199 199 int ret; 200 200 201 - obj = drm_gem_object_lookup(dev, file_priv, handle); 201 + obj = drm_gem_object_lookup(file_priv, handle); 202 202 if (!obj) { 203 203 DRM_ERROR("failed to lookup gem object.\n"); 204 204 return -EINVAL;
+10 -10
drivers/gpu/drm/tegra/drm.c
··· 268 268 } 269 269 270 270 static struct host1x_bo * 271 - host1x_bo_lookup(struct drm_device *drm, struct drm_file *file, u32 handle) 271 + host1x_bo_lookup(struct drm_file *file, u32 handle) 272 272 { 273 273 struct drm_gem_object *gem; 274 274 struct tegra_bo *bo; 275 275 276 - gem = drm_gem_object_lookup(drm, file, handle); 276 + gem = drm_gem_object_lookup(file, handle); 277 277 if (!gem) 278 278 return NULL; 279 279 ··· 311 311 if (err < 0) 312 312 return err; 313 313 314 - dest->cmdbuf.bo = host1x_bo_lookup(drm, file, cmdbuf); 314 + dest->cmdbuf.bo = host1x_bo_lookup(file, cmdbuf); 315 315 if (!dest->cmdbuf.bo) 316 316 return -ENOENT; 317 317 318 - dest->target.bo = host1x_bo_lookup(drm, file, target); 318 + dest->target.bo = host1x_bo_lookup(file, target); 319 319 if (!dest->target.bo) 320 320 return -ENOENT; 321 321 ··· 363 363 goto fail; 364 364 } 365 365 366 - bo = host1x_bo_lookup(drm, file, cmdbuf.handle); 366 + bo = host1x_bo_lookup(file, cmdbuf.handle); 367 367 if (!bo) { 368 368 err = -ENOENT; 369 369 goto fail; ··· 463 463 struct drm_gem_object *gem; 464 464 struct tegra_bo *bo; 465 465 466 - gem = drm_gem_object_lookup(drm, file, args->handle); 466 + gem = drm_gem_object_lookup(file, args->handle); 467 467 if (!gem) 468 468 return -EINVAL; 469 469 ··· 672 672 return -EINVAL; 673 673 } 674 674 675 - gem = drm_gem_object_lookup(drm, file, args->handle); 675 + gem = drm_gem_object_lookup(file, args->handle); 676 676 if (!gem) 677 677 return -ENOENT; 678 678 ··· 694 694 struct tegra_bo *bo; 695 695 int err = 0; 696 696 697 - gem = drm_gem_object_lookup(drm, file, args->handle); 697 + gem = drm_gem_object_lookup(file, args->handle); 698 698 if (!gem) 699 699 return -ENOENT; 700 700 ··· 736 736 if (args->flags & ~DRM_TEGRA_GEM_FLAGS) 737 737 return -EINVAL; 738 738 739 - gem = drm_gem_object_lookup(drm, file, args->handle); 739 + gem = drm_gem_object_lookup(file, args->handle); 740 740 if (!gem) 741 741 return -ENOENT; 742 742 ··· 758 758 struct drm_gem_object *gem; 759 759 struct tegra_bo *bo; 760 760 761 - gem = drm_gem_object_lookup(drm, file, args->handle); 761 + gem = drm_gem_object_lookup(file, args->handle); 762 762 if (!gem) 763 763 return -ENOENT; 764 764
+1 -1
drivers/gpu/drm/tegra/fb.c
··· 149 149 unsigned int height = cmd->height / (i ? vsub : 1); 150 150 unsigned int size, bpp; 151 151 152 - gem = drm_gem_object_lookup(drm, file, cmd->handles[i]); 152 + gem = drm_gem_object_lookup(file, cmd->handles[i]); 153 153 if (!gem) { 154 154 err = -ENXIO; 155 155 goto unreference;
+1 -1
drivers/gpu/drm/tegra/gem.c
··· 401 401 struct drm_gem_object *gem; 402 402 struct tegra_bo *bo; 403 403 404 - gem = drm_gem_object_lookup(drm, file, handle); 404 + gem = drm_gem_object_lookup(file, handle); 405 405 if (!gem) { 406 406 dev_err(drm->dev, "failed to lookup GEM object\n"); 407 407 return -EINVAL;
+1 -1
drivers/gpu/drm/udl/udl_fb.c
··· 500 500 int ret; 501 501 uint32_t size; 502 502 503 - obj = drm_gem_object_lookup(dev, file, mode_cmd->handles[0]); 503 + obj = drm_gem_object_lookup(file, mode_cmd->handles[0]); 504 504 if (obj == NULL) 505 505 return ERR_PTR(-ENOENT); 506 506
+1 -1
drivers/gpu/drm/udl/udl_gem.c
··· 217 217 int ret = 0; 218 218 219 219 mutex_lock(&dev->struct_mutex); 220 - obj = drm_gem_object_lookup(dev, file, handle); 220 + obj = drm_gem_object_lookup(file, handle); 221 221 if (obj == NULL) { 222 222 ret = -ENOENT; 223 223 goto unlock;
+1 -1
drivers/gpu/drm/vc4/vc4_bo.c
··· 457 457 struct drm_vc4_mmap_bo *args = data; 458 458 struct drm_gem_object *gem_obj; 459 459 460 - gem_obj = drm_gem_object_lookup(dev, file_priv, args->handle); 460 + gem_obj = drm_gem_object_lookup(file_priv, args->handle); 461 461 if (!gem_obj) { 462 462 DRM_ERROR("Failed to look up GEM BO %d\n", args->handle); 463 463 return -EINVAL;
+1 -1
drivers/gpu/drm/vc4/vc4_gem.c
··· 822 822 if (args->pad != 0) 823 823 return -EINVAL; 824 824 825 - gem_obj = drm_gem_object_lookup(dev, file_priv, args->handle); 825 + gem_obj = drm_gem_object_lookup(file_priv, args->handle); 826 826 if (!gem_obj) { 827 827 DRM_ERROR("Failed to look up GEM BO %d\n", args->handle); 828 828 return -EINVAL;
+1 -1
drivers/gpu/drm/vgem/vgem_drv.c
··· 200 200 int ret = 0; 201 201 struct drm_gem_object *obj; 202 202 203 - obj = drm_gem_object_lookup(dev, file, handle); 203 + obj = drm_gem_object_lookup(file, handle); 204 204 if (!obj) 205 205 return -ENOENT; 206 206
+2 -2
drivers/gpu/drm/virtio/virtgpu_display.c
··· 68 68 } 69 69 70 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 72 if (gobj == NULL) 73 73 return -ENOENT; 74 74 ··· 447 447 int ret; 448 448 449 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 451 if (!obj) 452 452 return ERR_PTR(-EINVAL); 453 453
+1 -1
drivers/gpu/drm/virtio/virtgpu_gem.c
··· 130 130 struct drm_gem_object *gobj; 131 131 struct virtio_gpu_object *obj; 132 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 134 if (gobj == NULL) 135 135 return -ENOENT; 136 136 obj = gem_to_virtio_gpu_obj(gobj);
+5 -6
drivers/gpu/drm/virtio/virtgpu_ioctl.c
··· 133 133 } 134 134 135 135 for (i = 0; i < exbuf->num_bo_handles; i++) { 136 - gobj = drm_gem_object_lookup(dev, 137 - drm_file, bo_handles[i]); 136 + gobj = drm_gem_object_lookup(drm_file, bo_handles[i]); 138 137 if (!gobj) { 139 138 drm_free_large(bo_handles); 140 139 drm_free_large(buflist); ··· 344 345 struct drm_gem_object *gobj = NULL; 345 346 struct virtio_gpu_object *qobj = NULL; 346 347 347 - gobj = drm_gem_object_lookup(dev, file_priv, ri->bo_handle); 348 + gobj = drm_gem_object_lookup(file_priv, ri->bo_handle); 348 349 if (gobj == NULL) 349 350 return -ENOENT; 350 351 ··· 373 374 if (vgdev->has_virgl_3d == false) 374 375 return -ENOSYS; 375 376 376 - gobj = drm_gem_object_lookup(dev, file, args->bo_handle); 377 + gobj = drm_gem_object_lookup(file, args->bo_handle); 377 378 if (gobj == NULL) 378 379 return -ENOENT; 379 380 ··· 417 418 int ret; 418 419 u32 offset = args->offset; 419 420 420 - gobj = drm_gem_object_lookup(dev, file, args->bo_handle); 421 + gobj = drm_gem_object_lookup(file, args->bo_handle); 421 422 if (gobj == NULL) 422 423 return -ENOENT; 423 424 ··· 463 464 int ret; 464 465 bool nowait = false; 465 466 466 - gobj = drm_gem_object_lookup(dev, file, args->handle); 467 + gobj = drm_gem_object_lookup(file, args->handle); 467 468 if (gobj == NULL) 468 469 return -ENOENT; 469 470
+1 -3
include/drm/drm_gem.h
··· 238 238 void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages, 239 239 bool dirty, bool accessed); 240 240 241 - struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev, 242 - struct drm_file *filp, 243 - u32 handle); 241 + struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); 244 242 int drm_gem_dumb_destroy(struct drm_file *file, 245 243 struct drm_device *dev, 246 244 uint32_t handle);