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

drm: 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

Pay special attention to the compat #define

v2: keep sed and #define removal separate

Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org> (v1)
Reviewed-by: Steven Price <steven.price@arm.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-14-emil.l.velikov@gmail.com

authored by

Emil Velikov and committed by
Emil Velikov
be6ee102 2f4dd13d

+34 -34
+1 -1
Documentation/gpu/drm-mm.rst
··· 178 178 -------------------- 179 179 180 180 All GEM objects are reference-counted by the GEM core. References can be 181 - acquired and release by calling drm_gem_object_get() and drm_gem_object_put_unlocked() 181 + acquired and release by calling drm_gem_object_get() and drm_gem_object_put() 182 182 respectively. 183 183 184 184 When the last reference to a GEM object is released the GEM core calls
+1 -1
drivers/gpu/drm/drm_client.c
··· 237 237 drm_gem_vunmap(buffer->gem, buffer->vaddr); 238 238 239 239 if (buffer->gem) 240 - drm_gem_object_put_unlocked(buffer->gem); 240 + drm_gem_object_put(buffer->gem); 241 241 242 242 if (buffer->handle) 243 243 drm_mode_destroy_dumb(dev, buffer->handle, buffer->client->file);
+13 -13
drivers/gpu/drm/drm_gem.c
··· 235 235 mutex_unlock(&dev->object_name_lock); 236 236 237 237 if (final) 238 - drm_gem_object_put_unlocked(obj); 238 + drm_gem_object_put(obj); 239 239 } 240 240 241 241 /* ··· 331 331 332 332 *offset = drm_vma_node_offset_addr(&obj->vma_node); 333 333 out: 334 - drm_gem_object_put_unlocked(obj); 334 + drm_gem_object_put(obj); 335 335 336 336 return ret; 337 337 } ··· 690 690 * Returns: 691 691 * 692 692 * @objs filled in with GEM object pointers. Returned GEM objects need to be 693 - * released with drm_gem_object_put_unlocked(). -ENOENT is returned on a lookup 693 + * released with drm_gem_object_put(). -ENOENT is returned on a lookup 694 694 * failure. 0 is returned on success. 695 695 * 696 696 */ ··· 785 785 else if (ret > 0) 786 786 ret = 0; 787 787 788 - drm_gem_object_put_unlocked(obj); 788 + drm_gem_object_put(obj); 789 789 790 790 return ret; 791 791 } ··· 860 860 861 861 err: 862 862 mutex_unlock(&dev->object_name_lock); 863 - drm_gem_object_put_unlocked(obj); 863 + drm_gem_object_put(obj); 864 864 return ret; 865 865 } 866 866 ··· 898 898 899 899 /* drm_gem_handle_create_tail unlocks dev->object_name_lock. */ 900 900 ret = drm_gem_handle_create_tail(file_priv, obj, &handle); 901 - drm_gem_object_put_unlocked(obj); 901 + drm_gem_object_put(obj); 902 902 if (ret) 903 903 return ret; 904 904 ··· 991 991 * driver doesn't use &drm_device.struct_mutex for anything. 992 992 * 993 993 * For drivers not encumbered with legacy locking use 994 - * drm_gem_object_put_unlocked() instead. 994 + * drm_gem_object_put() instead. 995 995 */ 996 996 void 997 997 drm_gem_object_put_locked(struct drm_gem_object *obj) ··· 1030 1030 { 1031 1031 struct drm_gem_object *obj = vma->vm_private_data; 1032 1032 1033 - drm_gem_object_put_unlocked(obj); 1033 + drm_gem_object_put(obj); 1034 1034 } 1035 1035 EXPORT_SYMBOL(drm_gem_vm_close); 1036 1036 ··· 1079 1079 if (obj->funcs && obj->funcs->mmap) { 1080 1080 ret = obj->funcs->mmap(obj, vma); 1081 1081 if (ret) { 1082 - drm_gem_object_put_unlocked(obj); 1082 + drm_gem_object_put(obj); 1083 1083 return ret; 1084 1084 } 1085 1085 WARN_ON(!(vma->vm_flags & VM_DONTEXPAND)); ··· 1089 1089 else if (dev->driver->gem_vm_ops) 1090 1090 vma->vm_ops = dev->driver->gem_vm_ops; 1091 1091 else { 1092 - drm_gem_object_put_unlocked(obj); 1092 + drm_gem_object_put(obj); 1093 1093 return -EINVAL; 1094 1094 } 1095 1095 ··· 1155 1155 return -EINVAL; 1156 1156 1157 1157 if (!drm_vma_node_is_allowed(node, priv)) { 1158 - drm_gem_object_put_unlocked(obj); 1158 + drm_gem_object_put(obj); 1159 1159 return -EACCES; 1160 1160 } 1161 1161 1162 1162 if (node->readonly) { 1163 1163 if (vma->vm_flags & VM_WRITE) { 1164 - drm_gem_object_put_unlocked(obj); 1164 + drm_gem_object_put(obj); 1165 1165 return -EINVAL; 1166 1166 } 1167 1167 ··· 1171 1171 ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, 1172 1172 vma); 1173 1173 1174 - drm_gem_object_put_unlocked(obj); 1174 + drm_gem_object_put(obj); 1175 1175 1176 1176 return ret; 1177 1177 }
+4 -4
drivers/gpu/drm/drm_gem_cma_helper.c
··· 114 114 return cma_obj; 115 115 116 116 error: 117 - drm_gem_object_put_unlocked(&cma_obj->base); 117 + drm_gem_object_put(&cma_obj->base); 118 118 return ERR_PTR(ret); 119 119 } 120 120 EXPORT_SYMBOL_GPL(drm_gem_cma_create); ··· 156 156 */ 157 157 ret = drm_gem_handle_create(file_priv, gem_obj, handle); 158 158 /* drop reference from allocate - handle holds it now. */ 159 - drm_gem_object_put_unlocked(gem_obj); 159 + drm_gem_object_put(gem_obj); 160 160 if (ret) 161 161 return ERR_PTR(ret); 162 162 ··· 380 380 return -EINVAL; 381 381 382 382 if (!drm_vma_node_is_allowed(node, priv)) { 383 - drm_gem_object_put_unlocked(obj); 383 + drm_gem_object_put(obj); 384 384 return -EACCES; 385 385 } 386 386 387 387 cma_obj = to_drm_gem_cma_obj(obj); 388 388 389 - drm_gem_object_put_unlocked(obj); 389 + drm_gem_object_put(obj); 390 390 391 391 return cma_obj->vaddr ? (unsigned long)cma_obj->vaddr : -EINVAL; 392 392 }
+3 -3
drivers/gpu/drm/drm_gem_framebuffer_helper.c
··· 95 95 int i; 96 96 97 97 for (i = 0; i < 4; i++) 98 - drm_gem_object_put_unlocked(fb->obj[i]); 98 + drm_gem_object_put(fb->obj[i]); 99 99 100 100 drm_framebuffer_cleanup(fb); 101 101 kfree(fb); ··· 175 175 + mode_cmd->offsets[i]; 176 176 177 177 if (objs[i]->size < min_size) { 178 - drm_gem_object_put_unlocked(objs[i]); 178 + drm_gem_object_put(objs[i]); 179 179 ret = -EINVAL; 180 180 goto err_gem_object_put; 181 181 } ··· 189 189 190 190 err_gem_object_put: 191 191 for (i--; i >= 0; i--) 192 - drm_gem_object_put_unlocked(objs[i]); 192 + drm_gem_object_put(objs[i]); 193 193 194 194 return ret; 195 195 }
+2 -2
drivers/gpu/drm/drm_gem_shmem_helper.c
··· 360 360 */ 361 361 ret = drm_gem_handle_create(file_priv, &shmem->base, handle); 362 362 /* drop reference from allocate - handle holds it now. */ 363 - drm_gem_object_put_unlocked(&shmem->base); 363 + drm_gem_object_put(&shmem->base); 364 364 if (ret) 365 365 return ERR_PTR(ret); 366 366 ··· 684 684 err_free_array: 685 685 kvfree(shmem->pages); 686 686 err_free_gem: 687 - drm_gem_object_put_unlocked(&shmem->base); 687 + drm_gem_object_put(&shmem->base); 688 688 689 689 return ERR_PTR(ret); 690 690 }
+1 -1
drivers/gpu/drm/drm_gem_ttm_helper.c
··· 74 74 * ttm has its own object refcounting, so drop gem reference 75 75 * to avoid double accounting counting. 76 76 */ 77 - drm_gem_object_put_unlocked(gem); 77 + drm_gem_object_put(gem); 78 78 79 79 return 0; 80 80 }
+5 -5
drivers/gpu/drm/drm_gem_vram_helper.c
··· 618 618 619 619 ret = drm_gem_handle_create(file, &gbo->bo.base, &handle); 620 620 if (ret) 621 - goto err_drm_gem_object_put_unlocked; 621 + goto err_drm_gem_object_put; 622 622 623 - drm_gem_object_put_unlocked(&gbo->bo.base); 623 + drm_gem_object_put(&gbo->bo.base); 624 624 625 625 args->pitch = pitch; 626 626 args->size = size; ··· 628 628 629 629 return 0; 630 630 631 - err_drm_gem_object_put_unlocked: 632 - drm_gem_object_put_unlocked(&gbo->bo.base); 631 + err_drm_gem_object_put: 632 + drm_gem_object_put(&gbo->bo.base); 633 633 return ret; 634 634 } 635 635 EXPORT_SYMBOL(drm_gem_vram_fill_create_dumb); ··· 737 737 gbo = drm_gem_vram_of_gem(gem); 738 738 *offset = drm_gem_vram_mmap_offset(gbo); 739 739 740 - drm_gem_object_put_unlocked(gem); 740 + drm_gem_object_put(gem); 741 741 742 742 return 0; 743 743 }
+3 -3
drivers/gpu/drm/drm_prime.c
··· 270 270 struct drm_device *dev = obj->dev; 271 271 272 272 /* drop the reference on the export fd holds */ 273 - drm_gem_object_put_unlocked(obj); 273 + drm_gem_object_put(obj); 274 274 275 275 drm_dev_put(dev); 276 276 } ··· 329 329 330 330 /* _handle_create_tail unconditionally unlocks dev->object_name_lock. */ 331 331 ret = drm_gem_handle_create_tail(file_priv, obj, handle); 332 - drm_gem_object_put_unlocked(obj); 332 + drm_gem_object_put(obj); 333 333 if (ret) 334 334 goto out_put; 335 335 ··· 500 500 fail_put_dmabuf: 501 501 dma_buf_put(dmabuf); 502 502 out: 503 - drm_gem_object_put_unlocked(obj); 503 + drm_gem_object_put(obj); 504 504 out_unlock: 505 505 mutex_unlock(&file_priv->prime.lock); 506 506
+1 -1
include/drm/drm_gem.h
··· 188 188 * Reference count of this object 189 189 * 190 190 * Please use drm_gem_object_get() to acquire and drm_gem_object_put_locked() 191 - * or drm_gem_object_put_unlocked() to release a reference to a GEM 191 + * or drm_gem_object_put() to release a reference to a GEM 192 192 * buffer object. 193 193 */ 194 194 struct kref refcount;