Commit e07ddb0c authored by Emil Velikov's avatar Emil Velikov Committed by Emil Velikov
Browse files

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: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-15-emil.l.velikov@gmail.com
parent be6ee102

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp, 
		}



		bo = amdgpu_bo_ref(gem_to_amdgpu_bo(gobj));

		drm_gem_object_put_unlocked(gobj);

		drm_gem_object_put(gobj);



		usermm = amdgpu_ttm_tt_get_usermm(bo->tbo.ttm);

		if (usermm) {

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, 
	/* One for TTM and one for the CS job */

	p->uf_entry.tv.num_shared = 2;



	drm_gem_object_put_unlocked(gobj);

	drm_gem_object_put(gobj);



	size = amdgpu_bo_size(bo);

	if (size != PAGE_SIZE || (data->offset + 8) > size) {

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −2
Original line number Diff line number Diff line
@@ -575,14 +575,14 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, 


	amdgpu_fb = kzalloc(sizeof(*amdgpu_fb), GFP_KERNEL);

	if (amdgpu_fb == NULL) {

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

		return ERR_PTR(-ENOMEM);

	}



	ret = amdgpu_display_framebuffer_init(dev, amdgpu_fb, mode_cmd, obj);

	if (ret) {

		kfree(amdgpu_fb);

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

		return ERR_PTR(ret);

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, 
	attach = dma_buf_dynamic_attach(dma_buf, dev->dev,

					&amdgpu_dma_buf_attach_ops, obj);

	if (IS_ERR(attach)) {

		drm_gem_object_put_unlocked(obj);

		drm_gem_object_put(obj);

		return ERR_CAST(attach);

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void amdgpufb_destroy_pinned_object(struct drm_gem_object *gobj) 
		amdgpu_bo_unpin(abo);

		amdgpu_bo_unreserve(abo);

	}

	drm_gem_object_put_unlocked(gobj);

	drm_gem_object_put(gobj);

}



static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
@@ -279,7 +279,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 


	}

	if (fb && ret) {

		drm_gem_object_put_unlocked(gobj);

		drm_gem_object_put(gobj);

		drm_framebuffer_unregister_private(fb);

		drm_framebuffer_cleanup(fb);

		kfree(fb);