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

drm/gem: add _locked suffix to drm_gem_object_put 



Vast majority of DRM (core and drivers) are struct_mutex free.

As such we have only a handful of cases where the locked helper should
be used. Make that stand out a little bit better.

Done via the following script:

__from=drm_gem_object_put
__to=drm_gem_object_put_locked

for __file in $(git grep --name-only --word-regexp $__from); do
  sed -i  "s/\<$__from\>/$__to/g" $__file;
done

Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: linux-arm-msm@vger.kernel.org
Signed-off-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-12-emil.l.velikov@gmail.com
parent b5d25074

drivers/gpu/drm/drm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ drm_gem_object_free(struct kref *kref) 
EXPORT_SYMBOL(drm_gem_object_free);



/**

 * drm_gem_object_put - release a GEM buffer object reference

 * drm_gem_object_put_locked - release a GEM buffer object reference

 * @obj: GEM buffer object

 *

 * This releases a reference to @obj. Callers must hold the
@@ -994,7 +994,7 @@ EXPORT_SYMBOL(drm_gem_object_free); 
 * drm_gem_object_put_unlocked() instead.

 */

void

drm_gem_object_put(struct drm_gem_object *obj)

drm_gem_object_put_locked(struct drm_gem_object *obj)

{

	if (obj) {

		WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex));
@@ -1002,7 +1002,7 @@ drm_gem_object_put(struct drm_gem_object *obj) 
		kref_put(&obj->refcount, drm_gem_object_free);

	}

}

EXPORT_SYMBOL(drm_gem_object_put);

EXPORT_SYMBOL(drm_gem_object_put_locked);



/**

 * drm_gem_vm_open - vma->ops->open implementation for GEM

drivers/gpu/drm/msm/adreno/a5xx_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -124,13 +124,13 @@ reset_set(void *data, u64 val) 


	if (a5xx_gpu->pm4_bo) {

		msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace);

		drm_gem_object_put(a5xx_gpu->pm4_bo);

		drm_gem_object_put_locked(a5xx_gpu->pm4_bo);

		a5xx_gpu->pm4_bo = NULL;

	}



	if (a5xx_gpu->pfp_bo) {

		msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace);

		drm_gem_object_put(a5xx_gpu->pfp_bo);

		drm_gem_object_put_locked(a5xx_gpu->pfp_bo);

		a5xx_gpu->pfp_bo = NULL;

	}

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data, 
		ret = 0;

	}



	drm_gem_object_put(obj);

	drm_gem_object_put_locked(obj);



unlock:

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/msm/msm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m) 
}

#endif



/* don't call directly!  Use drm_gem_object_put() and friends */

/* don't call directly!  Use drm_gem_object_put_locked() and friends */

void msm_gem_free_object(struct drm_gem_object *obj)

{

	struct msm_gem_object *msm_obj = to_msm_bo(obj);
@@ -1183,7 +1183,7 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size, 
	return vaddr;

err:

	if (locked)

		drm_gem_object_put(obj);

		drm_gem_object_put_locked(obj);

	else

		drm_gem_object_put_unlocked(obj);
@@ -1215,7 +1215,7 @@ void msm_gem_kernel_put(struct drm_gem_object *bo, 
	msm_gem_unpin_iova(bo, aspace);



	if (locked)

		drm_gem_object_put(bo);

		drm_gem_object_put_locked(bo);

	else

		drm_gem_object_put_unlocked(bo);

}

drivers/gpu/drm/msm/msm_gem_submit.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) 
		struct msm_gem_object *msm_obj = submit->bos[i].obj;

		submit_unlock_unpin_bo(submit, i, false);

		list_del_init(&msm_obj->submit_entry);

		drm_gem_object_put(&msm_obj->base);

		drm_gem_object_put_locked(&msm_obj->base);

	}

}