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

drm/amd: remove _unlocked suffix in drm_gem_object_put_unlocked

Spelling out _unlocked for each and every driver is a annoying.
Especially if we consider how many drivers, do not know (or need to)
about the horror stories involving struct_mutex.

Just drop the suffix. It makes the API cleaner.

Done via the following script:

__from=drm_gem_object_put_unlocked
__to=drm_gem_object_put
for __file in $(git grep --name-only $__from); do
sed -i "s/$__from/$__to/g" $__file;
done

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-15-emil.l.velikov@gmail.com

authored by

Emil Velikov and committed by
Emil Velikov
e07ddb0c be6ee102

+29 -29
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c
··· 102 102 } 103 103 104 104 bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj)); 105 - drm_gem_object_put_unlocked(gobj); 105 + drm_gem_object_put(gobj); 106 106 107 107 usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm); 108 108 if (usermm) {
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
··· 57 57 /* One for TTM and one for the CS job */ 58 58 p->uf_entry.tv.num_shared = 2; 59 59 60 - drm_gem_object_put_unlocked(gobj); 60 + drm_gem_object_put(gobj); 61 61 62 62 size = amdgpu_bo_size(bo); 63 63 if (size != PAGE_SIZE || (data->offset + 8) > size) {
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
··· 575 575 576 576 amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL); 577 577 if (amdgpu_fb == NULL) { 578 - drm_gem_object_put_unlocked(obj); 578 + drm_gem_object_put(obj); 579 579 return ERR_PTR(-ENOMEM); 580 580 } 581 581 582 582 ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj); 583 583 if (ret) { 584 584 kfree(amdgpu_fb); 585 - drm_gem_object_put_unlocked(obj); 585 + drm_gem_object_put(obj); 586 586 return ERR_PTR(ret); 587 587 } 588 588
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c
··· 587 587 attach = dma_buf_dynamic_attach(dma_buf, dev->dev, 588 588 &amdgpu_dma_buf_attach_ops, obj); 589 589 if (IS_ERR(attach)) { 590 - drm_gem_object_put_unlocked(obj); 590 + drm_gem_object_put(obj); 591 591 return ERR_CAST(attach); 592 592 } 593 593
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
··· 114 114 amdgpu_bo_unpin(abo); 115 115 amdgpu_bo_unreserve(abo); 116 116 } 117 - drm_gem_object_put_unlocked(gobj); 117 + drm_gem_object_put(gobj); 118 118 } 119 119 120 120 static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, ··· 279 279 280 280 } 281 281 if (fb && ret) { 282 - drm_gem_object_put_unlocked(gobj); 282 + drm_gem_object_put(gobj); 283 283 drm_framebuffer_unregister_private(fb); 284 284 drm_framebuffer_cleanup(fb); 285 285 kfree(fb);
+10 -10
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
··· 106 106 spin_lock(&file->table_lock); 107 107 idr_for_each_entry(&file->object_idr, gobj, handle) { 108 108 WARN_ONCE(1, "And also active allocations!\n"); 109 - drm_gem_object_put_unlocked(gobj); 109 + drm_gem_object_put(gobj); 110 110 } 111 111 idr_destroy(&file->object_idr); 112 112 spin_unlock(&file->table_lock); ··· 272 272 273 273 r = drm_gem_handle_create(filp, gobj, &handle); 274 274 /* drop reference from allocate - handle holds it now */ 275 - drm_gem_object_put_unlocked(gobj); 275 + drm_gem_object_put(gobj); 276 276 if (r) 277 277 return r; 278 278 ··· 356 356 amdgpu_ttm_tt_get_user_pages_done(bo->tbo.ttm); 357 357 358 358 release_object: 359 - drm_gem_object_put_unlocked(gobj); 359 + drm_gem_object_put(gobj); 360 360 361 361 return r; 362 362 } ··· 375 375 robj = gem_to_amdgpu_bo(gobj); 376 376 if (amdgpu_ttm_tt_get_usermm(robj->tbo.ttm) || 377 377 (robj->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)) { 378 - drm_gem_object_put_unlocked(gobj); 378 + drm_gem_object_put(gobj); 379 379 return -EPERM; 380 380 } 381 381 *offset_p = amdgpu_bo_mmap_offset(robj); 382 - drm_gem_object_put_unlocked(gobj); 382 + drm_gem_object_put(gobj); 383 383 return 0; 384 384 } 385 385 ··· 449 449 } else 450 450 r = ret; 451 451 452 - drm_gem_object_put_unlocked(gobj); 452 + drm_gem_object_put(gobj); 453 453 return r; 454 454 } 455 455 ··· 492 492 unreserve: 493 493 amdgpu_bo_unreserve(robj); 494 494 out: 495 - drm_gem_object_put_unlocked(gobj); 495 + drm_gem_object_put(gobj); 496 496 return r; 497 497 } 498 498 ··· 691 691 ttm_eu_backoff_reservation(&ticket, &list); 692 692 693 693 error_unref: 694 - drm_gem_object_put_unlocked(gobj); 694 + drm_gem_object_put(gobj); 695 695 return r; 696 696 } 697 697 ··· 767 767 } 768 768 769 769 out: 770 - drm_gem_object_put_unlocked(gobj); 770 + drm_gem_object_put(gobj); 771 771 return r; 772 772 } 773 773 ··· 804 804 805 805 r = drm_gem_handle_create(file_priv, gobj, &handle); 806 806 /* drop reference from allocate - handle holds it now */ 807 - drm_gem_object_put_unlocked(gobj); 807 + drm_gem_object_put(gobj); 808 808 if (r) { 809 809 return r; 810 810 }
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
··· 2404 2404 aobj = gem_to_amdgpu_bo(obj); 2405 2405 ret = amdgpu_bo_reserve(aobj, false); 2406 2406 if (ret != 0) { 2407 - drm_gem_object_put_unlocked(obj); 2407 + drm_gem_object_put(obj); 2408 2408 return ret; 2409 2409 } 2410 2410 ··· 2412 2412 amdgpu_bo_unreserve(aobj); 2413 2413 if (ret) { 2414 2414 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2415 - drm_gem_object_put_unlocked(obj); 2415 + drm_gem_object_put(obj); 2416 2416 return ret; 2417 2417 } 2418 2418 amdgpu_crtc->cursor_addr = amdgpu_bo_gpu_offset(aobj); ··· 2447 2447 amdgpu_bo_unpin(aobj); 2448 2448 amdgpu_bo_unreserve(aobj); 2449 2449 } 2450 - drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2450 + drm_gem_object_put(amdgpu_crtc->cursor_bo); 2451 2451 } 2452 2452 2453 2453 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
··· 2483 2483 aobj = gem_to_amdgpu_bo(obj); 2484 2484 ret = amdgpu_bo_reserve(aobj, false); 2485 2485 if (ret != 0) { 2486 - drm_gem_object_put_unlocked(obj); 2486 + drm_gem_object_put(obj); 2487 2487 return ret; 2488 2488 } 2489 2489 ··· 2491 2491 amdgpu_bo_unreserve(aobj); 2492 2492 if (ret) { 2493 2493 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2494 - drm_gem_object_put_unlocked(obj); 2494 + drm_gem_object_put(obj); 2495 2495 return ret; 2496 2496 } 2497 2497 amdgpu_crtc->cursor_addr = amdgpu_bo_gpu_offset(aobj); ··· 2526 2526 amdgpu_bo_unpin(aobj); 2527 2527 amdgpu_bo_unreserve(aobj); 2528 2528 } 2529 - drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2529 + drm_gem_object_put(amdgpu_crtc->cursor_bo); 2530 2530 } 2531 2531 2532 2532 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
··· 2299 2299 aobj = gem_to_amdgpu_bo(obj); 2300 2300 ret = amdgpu_bo_reserve(aobj, false); 2301 2301 if (ret != 0) { 2302 - drm_gem_object_put_unlocked(obj); 2302 + drm_gem_object_put(obj); 2303 2303 return ret; 2304 2304 } 2305 2305 ··· 2307 2307 amdgpu_bo_unreserve(aobj); 2308 2308 if (ret) { 2309 2309 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2310 - drm_gem_object_put_unlocked(obj); 2310 + drm_gem_object_put(obj); 2311 2311 return ret; 2312 2312 } 2313 2313 amdgpu_crtc->cursor_addr = amdgpu_bo_gpu_offset(aobj); ··· 2342 2342 amdgpu_bo_unpin(aobj); 2343 2343 amdgpu_bo_unreserve(aobj); 2344 2344 } 2345 - drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2345 + drm_gem_object_put(amdgpu_crtc->cursor_bo); 2346 2346 } 2347 2347 2348 2348 amdgpu_crtc->cursor_bo = obj;
+3 -3
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
··· 2305 2305 aobj = gem_to_amdgpu_bo(obj); 2306 2306 ret = amdgpu_bo_reserve(aobj, false); 2307 2307 if (ret != 0) { 2308 - drm_gem_object_put_unlocked(obj); 2308 + drm_gem_object_put(obj); 2309 2309 return ret; 2310 2310 } 2311 2311 ··· 2313 2313 amdgpu_bo_unreserve(aobj); 2314 2314 if (ret) { 2315 2315 DRM_ERROR("Failed to pin new cursor BO (%d)\n", ret); 2316 - drm_gem_object_put_unlocked(obj); 2316 + drm_gem_object_put(obj); 2317 2317 return ret; 2318 2318 } 2319 2319 amdgpu_crtc->cursor_addr = amdgpu_bo_gpu_offset(aobj); ··· 2348 2348 amdgpu_bo_unpin(aobj); 2349 2349 amdgpu_bo_unreserve(aobj); 2350 2350 } 2351 - drm_gem_object_put_unlocked(amdgpu_crtc->cursor_bo); 2351 + drm_gem_object_put(amdgpu_crtc->cursor_bo); 2352 2352 } 2353 2353 2354 2354 amdgpu_crtc->cursor_bo = obj;