On Mon, Jun 18, 2018 at 03:02:19PM +0200, Thomas Zimmermann wrote: > 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. Thanks for doing this. > Signed-off-by: Thomas Zimmermann <tdz@xxxxxxxxxxxxxxxxxxxxx> Reviewed-by: Jordan Crouse <jcrouse@xxxxxxxxxxxxxx> > --- > drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++-- > drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- > drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 +- > drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++-- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c > index 059ec7d394d0..d2127b1c4ece 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_debugfs.c > @@ -132,14 +132,14 @@ reset_set(void *data, u64 val) > if (a5xx_gpu->pm4_bo) { > if (a5xx_gpu->pm4_iova) > 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; > } > > if (a5xx_gpu->pfp_bo) { > if (a5xx_gpu->pfp_iova) > 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; > } > > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_power.c b/drivers/gpu/drm/msm/adreno/a5xx_power.c > index e9c0e56dbec0..7a41e1c147e4 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_power.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_power.c > @@ -323,7 +323,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) > if (a5xx_gpu->gpmu_iova) > msm_gem_put_iova(a5xx_gpu->gpmu_bo, gpu->aspace); > 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_iova = 0; > diff --git a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c > index 970c7963ae29..f3c21f827a4d 100644 > --- a/drivers/gpu/drm/msm/adreno/a5xx_preempt.c > +++ b/drivers/gpu/drm/msm/adreno/a5xx_preempt.c > @@ -272,7 +272,7 @@ void a5xx_preempt_fini(struct msm_gpu *gpu) > if (a5xx_gpu->preempt_iova[i]) > 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; > } > } > diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c > index 7bd83e0afa97..7a7923e6220d 100644 > --- a/drivers/gpu/drm/msm/msm_gem_submit.c > +++ b/drivers/gpu/drm/msm/msm_gem_submit.c > @@ -144,7 +144,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, > goto out_unlock; > } > > - drm_gem_object_reference(obj); > + drm_gem_object_get(obj); > > submit->bos[i].obj = msm_obj; > > @@ -396,7 +396,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_unreference(&msm_obj->base); > + drm_gem_object_put(&msm_obj->base); > } > > ww_acquire_fini(&submit->ticket); > -- > 2.14.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel