Commit 64686886 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Rob Clark

drm/msm: Replace drm_gem_object_{un/reference} with put, get functions

This patch unifies the naming of DRM functions for reference counting
of struct drm_gem_object. The resulting code is more aligned with the
rest of the Linux kernel interfaces.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent f2152d49
...@@ -132,14 +132,14 @@ reset_set(void *data, u64 val) ...@@ -132,14 +132,14 @@ reset_set(void *data, u64 val)
if (a5xx_gpu->pm4_bo) { if (a5xx_gpu->pm4_bo) {
if (a5xx_gpu->pm4_iova) if (a5xx_gpu->pm4_iova)
msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace); msm_gem_put_iova(a5xx_gpu->pm4_bo, gpu->aspace);
drm_gem_object_unreference(a5xx_gpu->pm4_bo); drm_gem_object_put(a5xx_gpu->pm4_bo);
a5xx_gpu->pm4_bo = NULL; a5xx_gpu->pm4_bo = NULL;
} }
if (a5xx_gpu->pfp_bo) { if (a5xx_gpu->pfp_bo) {
if (a5xx_gpu->pfp_iova) if (a5xx_gpu->pfp_iova)
msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace); msm_gem_put_iova(a5xx_gpu->pfp_bo, gpu->aspace);
drm_gem_object_unreference(a5xx_gpu->pfp_bo); drm_gem_object_put(a5xx_gpu->pfp_bo);
a5xx_gpu->pfp_bo = NULL; a5xx_gpu->pfp_bo = NULL;
} }
......
...@@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu, ...@@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu,
msm_gem_put_iova(dumper->bo, gpu->aspace); msm_gem_put_iova(dumper->bo, gpu->aspace);
msm_gem_put_vaddr(dumper->bo); msm_gem_put_vaddr(dumper->bo);
drm_gem_object_unreference(dumper->bo); drm_gem_object_put(dumper->bo);
} }
static int a5xx_crashdumper_run(struct msm_gpu *gpu, static int a5xx_crashdumper_run(struct msm_gpu *gpu,
......
...@@ -323,7 +323,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) ...@@ -323,7 +323,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu)
if (a5xx_gpu->gpmu_iova) if (a5xx_gpu->gpmu_iova)
msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace); msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace);
if (a5xx_gpu->gpmu_bo) if (a5xx_gpu->gpmu_bo)
drm_gem_object_unreference(a5xx_gpu->gpmu_bo); drm_gem_object_put(a5xx_gpu->gpmu_bo);
a5xx_gpu->gpmu_bo = NULL; a5xx_gpu->gpmu_bo = NULL;
a5xx_gpu->gpmu_iova = 0; a5xx_gpu->gpmu_iova = 0;
......
...@@ -276,7 +276,7 @@ void a5xx_preempt_fini(struct msm_gpu *gpu) ...@@ -276,7 +276,7 @@ void a5xx_preempt_fini(struct msm_gpu *gpu)
if (a5xx_gpu->preempt_iova[i]) if (a5xx_gpu->preempt_iova[i])
msm_gem_put_iova(a5xx_gpu->preempt_bo[i], gpu->aspace); msm_gem_put_iova(a5xx_gpu->preempt_bo[i], gpu->aspace);
drm_gem_object_unreference(a5xx_gpu->preempt_bo[i]); drm_gem_object_put(a5xx_gpu->preempt_bo[i]);
a5xx_gpu->preempt_bo[i] = NULL; a5xx_gpu->preempt_bo[i] = NULL;
} }
} }
......
...@@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu) ...@@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
if (a6xx_gpu->sqe_bo) { if (a6xx_gpu->sqe_bo) {
if (a6xx_gpu->sqe_iova) if (a6xx_gpu->sqe_iova)
msm_gem_put_iova(a6xx_gpu->sqe_bo, gpu->aspace); msm_gem_put_iova(a6xx_gpu->sqe_bo, gpu->aspace);
drm_gem_object_unreference_unlocked(a6xx_gpu->sqe_bo); drm_gem_object_put_unlocked(a6xx_gpu->sqe_bo);
} }
a6xx_gmu_remove(a6xx_gpu); a6xx_gmu_remove(a6xx_gpu);
......
...@@ -144,7 +144,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, ...@@ -144,7 +144,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,
goto out_unlock; goto out_unlock;
} }
drm_gem_object_reference(obj); drm_gem_object_get(obj);
submit->bos[i].obj = msm_obj; submit->bos[i].obj = msm_obj;
...@@ -396,7 +396,7 @@ static void submit_cleanup(struct msm_gem_submit *submit) ...@@ -396,7 +396,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_unreference(&msm_obj->base); drm_gem_object_put(&msm_obj->base);
} }
ww_acquire_fini(&submit->ticket); ww_acquire_fini(&submit->ticket);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment