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

drm/amdgpu: switch to drm_*{get,put} helpers

drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() and should not be
used by new code. So convert all users of compatibility functions to use
the new APIs.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Cihangir Akturk and committed by
Alex Deucher
f62facc2 d45aec05

+30 -30
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
··· 136 136 } 137 137 138 138 bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj)); 139 - drm_gem_object_unreference_unlocked(gobj); 139 + drm_gem_object_put_unlocked(gobj); 140 140 141 141 usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm); 142 142 if (usermm) {
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
··· 54 54 55 55 *offset = data->offset; 56 56 57 - drm_gem_object_unreference_unlocked(gobj); 57 + drm_gem_object_put_unlocked(gobj); 58 58 59 59 if (amdgpu_ttm_tt_get_usermm(p->uf_entry.robj->tbo.ttm)) { 60 60 amdgpu_bo_unref(&p->uf_entry.robj);
+3 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
··· 482 482 { 483 483 struct amdgpu_framebuffer *amdgpu_fb = to_amdgpu_framebuffer(fb); 484 484 485 - drm_gem_object_unreference_unlocked(amdgpu_fb->obj); 485 + drm_gem_object_put_unlocked(amdgpu_fb->obj); 486 486 drm_framebuffer_cleanup(fb); 487 487 kfree(amdgpu_fb); 488 488 } ··· 542 542 543 543 amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL); 544 544 if (amdgpu_fb == NULL) { 545 - drm_gem_object_unreference_unlocked(obj); 545 + drm_gem_object_put_unlocked(obj); 546 546 return ERR_PTR(-ENOMEM); 547 547 } 548 548 549 549 ret = amdgpu_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); 550 550 if (ret) { 551 551 kfree(amdgpu_fb); 552 - drm_gem_object_unreference_unlocked(obj); 552 + drm_gem_object_put_unlocked(obj); 553 553 return ERR_PTR(ret); 554 554 } 555 555
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
··· 118 118 amdgpu_bo_unpin(abo); 119 119 amdgpu_bo_unreserve(abo); 120 120 } 121 - drm_gem_object_unreference_unlocked(gobj); 121 + drm_gem_object_put_unlocked(gobj); 122 122 } 123 123 124 124 static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, ··· 280 280 281 281 } 282 282 if (fb && ret) { 283 - drm_gem_object_unreference_unlocked(gobj); 283 + drm_gem_object_put_unlocked(gobj); 284 284 drm_framebuffer_unregister_private(fb); 285 285 drm_framebuffer_cleanup(fb); 286 286 kfree(fb);
+11 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
··· 91 91 spin_lock(&file->table_lock); 92 92 idr_for_each_entry(&file->object_idr, gobj, handle) { 93 93 WARN_ONCE(1, "And also active allocations!\n"); 94 - drm_gem_object_unreference_unlocked(gobj); 94 + drm_gem_object_put_unlocked(gobj); 95 95 } 96 96 idr_destroy(&file->object_idr); 97 97 spin_unlock(&file->table_lock); ··· 263 263 264 264 r = drm_gem_handle_create(filp, gobj, &handle); 265 265 /* drop reference from allocate - handle holds it now */ 266 - drm_gem_object_unreference_unlocked(gobj); 266 + drm_gem_object_put_unlocked(gobj); 267 267 if (r) 268 268 return r; 269 269 ··· 341 341 342 342 r = drm_gem_handle_create(filp, gobj, &handle); 343 343 /* drop reference from allocate - handle holds it now */ 344 - drm_gem_object_unreference_unlocked(gobj); 344 + drm_gem_object_put_unlocked(gobj); 345 345 if (r) 346 346 return r; 347 347 ··· 355 355 up_read(&current->mm->mmap_sem); 356 356 357 357 release_object: 358 - drm_gem_object_unreference_unlocked(gobj); 358 + drm_gem_object_put_unlocked(gobj); 359 359 360 360 return r; 361 361 } ··· 374 374 robj = gem_to_amdgpu_bo(gobj); 375 375 if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) || 376 376 (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) { 377 - drm_gem_object_unreference_unlocked(gobj); 377 + drm_gem_object_put_unlocked(gobj); 378 378 return -EPERM; 379 379 } 380 380 *offset_p = amdgpu_bo_mmap_offset(robj); 381 - drm_gem_object_unreference_unlocked(gobj); 381 + drm_gem_object_put_unlocked(gobj); 382 382 return 0; 383 383 } 384 384 ··· 448 448 } else 449 449 r = ret; 450 450 451 - drm_gem_object_unreference_unlocked(gobj); 451 + drm_gem_object_put_unlocked(gobj); 452 452 return r; 453 453 } 454 454 ··· 491 491 unreserve: 492 492 amdgpu_bo_unreserve(robj); 493 493 out: 494 - drm_gem_object_unreference_unlocked(gobj); 494 + drm_gem_object_put_unlocked(gobj); 495 495 return r; 496 496 } 497 497 ··· 664 664 ttm_eu_backoff_reservation(&ticket, &list); 665 665 666 666 error_unref: 667 - drm_gem_object_unreference_unlocked(gobj); 667 + drm_gem_object_put_unlocked(gobj); 668 668 return r; 669 669 } 670 670 ··· 726 726 } 727 727 728 728 out: 729 - drm_gem_object_unreference_unlocked(gobj); 729 + drm_gem_object_put_unlocked(gobj); 730 730 return r; 731 731 } 732 732 ··· 754 754 755 755 r = drm_gem_handle_create(file_priv, gobj, &handle); 756 756 /* drop reference from allocate - handle holds it now */ 757 - drm_gem_object_unreference_unlocked(gobj); 757 + drm_gem_object_put_unlocked(gobj); 758 758 if (r) { 759 759 return r; 760 760 }
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2431 2431 aobj = gem_to_amdgpu_bo(obj); 2432 2432 ret = amdgpu_bo_reserve(aobj, false); 2433 2433 if (ret != 0) { 2434 - drm_gem_object_unreference_unlocked(obj); 2434 + drm_gem_object_put_unlocked(obj); 2435 2435 return ret; 2436 2436 } 2437 2437 ··· 2439 2439 amdgpu_bo_unreserve(aobj); 2440 2440 if (ret) { 2441 2441 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2442 - drm_gem_object_unreference_unlocked(obj); 2442 + drm_gem_object_put_unlocked(obj); 2443 2443 return ret; 2444 2444 } 2445 2445 ··· 2473 2473 amdgpu_bo_unpin(aobj); 2474 2474 amdgpu_bo_unreserve(aobj); 2475 2475 } 2476 - drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); 2476 + drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2477 2477 } 2478 2478 2479 2479 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2506 2506 aobj = gem_to_amdgpu_bo(obj); 2507 2507 ret = amdgpu_bo_reserve(aobj, false); 2508 2508 if (ret != 0) { 2509 - drm_gem_object_unreference_unlocked(obj); 2509 + drm_gem_object_put_unlocked(obj); 2510 2510 return ret; 2511 2511 } 2512 2512 ··· 2514 2514 amdgpu_bo_unreserve(aobj); 2515 2515 if (ret) { 2516 2516 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2517 - drm_gem_object_unreference_unlocked(obj); 2517 + drm_gem_object_put_unlocked(obj); 2518 2518 return ret; 2519 2519 } 2520 2520 ··· 2548 2548 amdgpu_bo_unpin(aobj); 2549 2549 amdgpu_bo_unreserve(aobj); 2550 2550 } 2551 - drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); 2551 + drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2552 2552 } 2553 2553 2554 2554 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
··· 2322 2322 aobj = gem_to_amdgpu_bo(obj); 2323 2323 ret = amdgpu_bo_reserve(aobj, false); 2324 2324 if (ret != 0) { 2325 - drm_gem_object_unreference_unlocked(obj); 2325 + drm_gem_object_put_unlocked(obj); 2326 2326 return ret; 2327 2327 } 2328 2328 ··· 2330 2330 amdgpu_bo_unreserve(aobj); 2331 2331 if (ret) { 2332 2332 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2333 - drm_gem_object_unreference_unlocked(obj); 2333 + drm_gem_object_put_unlocked(obj); 2334 2334 return ret; 2335 2335 } 2336 2336 ··· 2364 2364 amdgpu_bo_unpin(aobj); 2365 2365 amdgpu_bo_unreserve(aobj); 2366 2366 } 2367 - drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); 2367 + drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2368 2368 } 2369 2369 2370 2370 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2335 2335 aobj = gem_to_amdgpu_bo(obj); 2336 2336 ret = amdgpu_bo_reserve(aobj, false); 2337 2337 if (ret != 0) { 2338 - drm_gem_object_unreference_unlocked(obj); 2338 + drm_gem_object_put_unlocked(obj); 2339 2339 return ret; 2340 2340 } 2341 2341 ··· 2343 2343 amdgpu_bo_unreserve(aobj); 2344 2344 if (ret) { 2345 2345 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2346 - drm_gem_object_unreference_unlocked(obj); 2346 + drm_gem_object_put_unlocked(obj); 2347 2347 return ret; 2348 2348 } 2349 2349 ··· 2377 2377 amdgpu_bo_unpin(aobj); 2378 2378 amdgpu_bo_unreserve(aobj); 2379 2379 } 2380 - drm_gem_object_unreference_unlocked(amdgpu_crtc->cursor_bo); 2380 + drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2381 2381 } 2382 2382 2383 2383 amdgpu_crtc->cursor_bo = obj;