xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/gem: add _locked suffix to drm_gem_object_put

Browse Source 
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: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Steven Price <steven.price@arm.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515095118.2743122-12-emil.l.velikov@gmail.com
This commit is contained in:
Emil Velikov
2020-05-15 10:50:51 +01:00
committed by Emil Velikov
parent b5d250744c
commit eecd7fd8bf
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/drm_gem.c
View File

@@ -983,7 +983,7 @@ drm_gem_object_free(struct kref *kref)
EXPORT_SYMBOL(drm_gem_object_free); 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 * @obj: GEM buffer object
* *
* This releases a reference to @obj. Callers must hold the * 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. * drm_gem_object_put_unlocked() instead.
*/ */
void void
drm_gem_object_put(struct drm_gem_object *obj) drm_gem_object_put_locked(struct drm_gem_object *obj)
{ {
if (obj) { if (obj) {
WARN_ON(!mutex_is_locked(&obj->dev->struct_mutex)); 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); 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 * drm_gem_vm_open - vma->ops->open implementation for GEM

4
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c
View File

@@ -124,13 +124,13 @@ reset_set(void *data, u64 val)
if (a5xx_gpu->pm4_bo) { if (a5xx_gpu->pm4_bo) {
msm_gem_unpin_iova(a5xx_gpu->pm4_bo, gpu->aspace); 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; a5xx_gpu->pm4_bo = NULL;
} }
if (a5xx_gpu->pfp_bo) { if (a5xx_gpu->pfp_bo) {
msm_gem_unpin_iova(a5xx_gpu->pfp_bo, gpu->aspace); 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; a5xx_gpu->pfp_bo = NULL;
} }

2
drivers/gpu/drm/msm/msm_drv.c
View File

@@ -932,7 +932,7 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data,
ret = 0; ret = 0;
} }
drm_gem_object_put(obj); drm_gem_object_put_locked(obj);
unlock: unlock:
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);

6
drivers/gpu/drm/msm/msm_gem.c
View File

@@ -879,7 +879,7 @@ void msm_gem_describe_objects(struct list_head *list, struct seq_file *m)
} }
#endif #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) void msm_gem_free_object(struct drm_gem_object *obj)
{ {
struct msm_gem_object *msm_obj = to_msm_bo(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; return vaddr;
err: err:
if (locked) if (locked)
drm_gem_object_put(obj); drm_gem_object_put_locked(obj);
else else
drm_gem_object_put_unlocked(obj); 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); msm_gem_unpin_iova(bo, aspace);
if (locked) if (locked)
drm_gem_object_put(bo); drm_gem_object_put_locked(bo);
else else
drm_gem_object_put_unlocked(bo); drm_gem_object_put_unlocked(bo);
} }

2
drivers/gpu/drm/msm/msm_gem_submit.c
View File

@@ -387,7 +387,7 @@ static void submit_cleanup(struct msm_gem_submit *submit)
struct msm_gem_object *msm_obj = submit->bos[i].obj; struct msm_gem_object *msm_obj = submit->bos[i].obj;
submit_unlock_unpin_bo(submit, i, false); submit_unlock_unpin_bo(submit, i, false);
list_del_init(&msm_obj->submit_entry); list_del_init(&msm_obj->submit_entry);
drm_gem_object_put(&msm_obj->base); drm_gem_object_put_locked(&msm_obj->base);
} }
} }

2
drivers/gpu/drm/msm/msm_gpu.c
View File

@@ -694,7 +694,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring,
/* move to inactive: */ /* move to inactive: */
msm_gem_move_to_inactive(&msm_obj->base); msm_gem_move_to_inactive(&msm_obj->base);
msm_gem_unpin_iova(&msm_obj->base, submit->aspace); msm_gem_unpin_iova(&msm_obj->base, submit->aspace);
drm_gem_object_put(&msm_obj->base); drm_gem_object_put_locked(&msm_obj->base);
} }
pm_runtime_mark_last_busy(&gpu->pdev->dev); pm_runtime_mark_last_busy(&gpu->pdev->dev);

4
include/drm/drm_gem.h
View File

@@ -187,7 +187,7 @@ struct drm_gem_object {
* *
* Reference count of this object * Reference count of this object
* *
* Please use drm_gem_object_get() to acquire and drm_gem_object_put() * Please use drm_gem_object_get() to acquire and drm_gem_object_put_locked()
* or drm_gem_object_put_unlocked() to release a reference to a GEM * or drm_gem_object_put_unlocked() to release a reference to a GEM
* buffer object. * buffer object.
*/ */
@@ -375,7 +375,7 @@ drm_gem_object_put_unlocked(struct drm_gem_object *obj)
kref_put(&obj->refcount, drm_gem_object_free); kref_put(&obj->refcount, drm_gem_object_free);
} }
void drm_gem_object_put(struct drm_gem_object *obj); void drm_gem_object_put_locked(struct drm_gem_object *obj);
int drm_gem_handle_create(struct drm_file *file_priv, int drm_gem_handle_create(struct drm_file *file_priv,
struct drm_gem_object *obj, struct drm_gem_object *obj,