* [PATCH v3 0/3] drm/msm: Replace {un/reference} with {put, get} functions
@ 2018-09-26 11:48 Thomas Zimmermann
[not found] ` <20180926114859.23522-1-tzimmermann-l3A5Bk7waGM@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Zimmermann @ 2018-09-26 11:48 UTC (permalink / raw)
To: robdclark-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Thomas Zimmermann,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
This patch set replaces functions named {un,reference} by their
{put,get} counterparts. Affected data types are struct struct drm_framebuffer,
struct drm_gem_object, and struct drm_device.
With the reference-counting functions being named {put,get}, the DRM
interface is more aligned to Linux kernel nameing standard. The patch
set does not change driver-internal interfaces.
Changes since v2:
* fixed an instance in a6xx_destroy()
Changes since v1:
* rebased on 4.18
* adapted to changes in msm_drv.c and adreno/a5xx_gpu.c
Thomas Zimmermann (3):
drm/msm: Replace drm_framebuffer_{un/reference} with put,get functions
drm/msm: Replace drm_gem_object_{un/reference} with put,get functions
drm/msm: Replace drm_dev_unref with drm_dev_put
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++--
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++--
drivers/gpu/drm/msm/msm_drv.c | 8 ++++----
drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
--
2.19.0
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/3] drm/msm: Replace drm_framebuffer_{un/reference} with put, get functions
[not found] ` <20180926114859.23522-1-tzimmermann-l3A5Bk7waGM@public.gmane.org>
@ 2018-09-26 11:48 ` Thomas Zimmermann
2018-09-26 11:48 ` [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} " Thomas Zimmermann
2018-09-26 11:48 ` [PATCH v3 3/3] drm/msm: Replace drm_dev_unref with drm_dev_put Thomas Zimmermann
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Zimmermann @ 2018-09-26 11:48 UTC (permalink / raw)
To: robdclark-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Thomas Zimmermann,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
This patch unifies the naming of DRM functions for reference counting
of struct drm_framebuffer. The resulting code is more aligned with the
rest of the Linux kernel interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index 7d306c5acd09..c95dccb24b3c 100644
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@ -185,7 +185,7 @@ static void mdp5_plane_reset(struct drm_plane *plane)
struct mdp5_plane_state *mdp5_state;
if (plane->state && plane->state->fb)
- drm_framebuffer_unreference(plane->state->fb);
+ drm_framebuffer_put(plane->state->fb);
kfree(to_mdp5_plane_state(plane->state));
mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
@@ -228,7 +228,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane,
struct mdp5_plane_state *pstate = to_mdp5_plane_state(state);
if (state->fb)
- drm_framebuffer_unreference(state->fb);
+ drm_framebuffer_put(state->fb);
kfree(pstate);
}
--
2.19.0
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
[not found] ` <20180926114859.23522-1-tzimmermann-l3A5Bk7waGM@public.gmane.org>
2018-09-26 11:48 ` [PATCH v3 1/3] drm/msm: Replace drm_framebuffer_{un/reference} with put, get functions Thomas Zimmermann
@ 2018-09-26 11:48 ` Thomas Zimmermann
[not found] ` <20180926114859.23522-3-tzimmermann-l3A5Bk7waGM@public.gmane.org>
2018-09-26 11:48 ` [PATCH v3 3/3] drm/msm: Replace drm_dev_unref with drm_dev_put Thomas Zimmermann
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Zimmermann @ 2018-09-26 11:48 UTC (permalink / raw)
To: robdclark-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Thomas Zimmermann,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
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: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++--
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 +-
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++--
6 files changed, 8 insertions(+), 8 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_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
index ab1d9308c311..6a6849309b6a 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu,
msm_gem_put_iova(dumper->bo, gpu->aspace);
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,
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/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index c629f742a1d1..1a5d7a53752c 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
if (a6xx_gpu->sqe_bo) {
if (a6xx_gpu->sqe_iova)
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);
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.19.0
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] drm/msm: Replace drm_dev_unref with drm_dev_put
[not found] ` <20180926114859.23522-1-tzimmermann-l3A5Bk7waGM@public.gmane.org>
2018-09-26 11:48 ` [PATCH v3 1/3] drm/msm: Replace drm_framebuffer_{un/reference} with put, get functions Thomas Zimmermann
2018-09-26 11:48 ` [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} " Thomas Zimmermann
@ 2018-09-26 11:48 ` Thomas Zimmermann
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Zimmermann @ 2018-09-26 11:48 UTC (permalink / raw)
To: robdclark-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Thomas Zimmermann,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
This patch unifies the naming of DRM functions for reference counting
of struct drm_device. The resulting code is more aligned with the rest
of the Linux kernel interfaces.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/msm/msm_drv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index c1abad8a8612..4904d0d41409 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -337,7 +337,7 @@ static int msm_drm_uninit(struct device *dev)
mdss->funcs->destroy(ddev);
ddev->dev_private = NULL;
- drm_dev_unref(ddev);
+ drm_dev_put(ddev);
kfree(priv);
@@ -452,7 +452,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) {
ret = -ENOMEM;
- goto err_unref_drm_dev;
+ goto err_put_drm_dev;
}
ddev->dev_private = priv;
@@ -653,8 +653,8 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
mdss->funcs->destroy(ddev);
err_free_priv:
kfree(priv);
-err_unref_drm_dev:
- drm_dev_unref(ddev);
+err_put_drm_dev:
+ drm_dev_put(ddev);
return ret;
}
--
2.19.0
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
[not found] ` <20180926114859.23522-3-tzimmermann-l3A5Bk7waGM@public.gmane.org>
@ 2018-09-26 16:23 ` Jordan Crouse
[not found] ` <20180926162317.GJ10761-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Jordan Crouse @ 2018-09-26 16:23 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
robdclark-Re5JQEeQqe8AvxtiuMwx3w,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On Wed, Sep 26, 2018 at 01:48:58PM +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.
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++--
> drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
> drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
> drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 +-
> drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
> drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++--
> 6 files changed, 8 insertions(+), 8 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_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> index ab1d9308c311..6a6849309b6a 100644
> --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> @@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu,
> msm_gem_put_iova(dumper->bo, gpu->aspace);
> 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,
> 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/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> index c629f742a1d1..1a5d7a53752c 100644
> --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> @@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
> if (a6xx_gpu->sqe_bo) {
> if (a6xx_gpu->sqe_iova)
> 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);
> 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.19.0
>
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
--
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
[not found] ` <20180926162317.GJ10761-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org>
@ 2018-10-01 7:37 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2018-10-01 7:37 UTC (permalink / raw)
To: Thomas Zimmermann, robdclark-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On Wed, Sep 26, 2018 at 10:23:17AM -0600, Jordan Crouse wrote:
> On Wed, Sep 26, 2018 at 01:48:58PM +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.
>
> Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Care to review all 3 and then push them? Or is msm still not yet group
maintained :-)
Cheers, Daniel
>
> > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> > ---
> > drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 ++--
> > drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
> > drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +-
> > drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 2 +-
> > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +-
> > drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++--
> > 6 files changed, 8 insertions(+), 8 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_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> > index ab1d9308c311..6a6849309b6a 100644
> > --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> > +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
> > @@ -1234,7 +1234,7 @@ static void a5xx_crashdumper_free(struct msm_gpu *gpu,
> > msm_gem_put_iova(dumper->bo, gpu->aspace);
> > 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,
> > 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/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> > index c629f742a1d1..1a5d7a53752c 100644
> > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
> > @@ -744,7 +744,7 @@ static void a6xx_destroy(struct msm_gpu *gpu)
> > if (a6xx_gpu->sqe_bo) {
> > if (a6xx_gpu->sqe_iova)
> > 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);
> > 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.19.0
> >
> > _______________________________________________
> > Freedreno mailing list
> > Freedreno@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/freedreno
>
> --
> The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-01 7:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-26 11:48 [PATCH v3 0/3] drm/msm: Replace {un/reference} with {put, get} functions Thomas Zimmermann
[not found] ` <20180926114859.23522-1-tzimmermann-l3A5Bk7waGM@public.gmane.org>
2018-09-26 11:48 ` [PATCH v3 1/3] drm/msm: Replace drm_framebuffer_{un/reference} with put, get functions Thomas Zimmermann
2018-09-26 11:48 ` [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} " Thomas Zimmermann
[not found] ` <20180926114859.23522-3-tzimmermann-l3A5Bk7waGM@public.gmane.org>
2018-09-26 16:23 ` Jordan Crouse
[not found] ` <20180926162317.GJ10761-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org>
2018-10-01 7:37 ` Daniel Vetter
2018-09-26 11:48 ` [PATCH v3 3/3] drm/msm: Replace drm_dev_unref with drm_dev_put Thomas Zimmermann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.