drm/msm: Replace {un/reference} with {put, get} functions
Subsystems (4)
v3 cover drm/msm: Replace {un/reference} with {put, get} functions
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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/3 drm/msm: Replace drm_framebuffer_{un/reference} with put, get functions
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.
--- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +2 -2
@@ -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); }
Signature · 6 lines
2.19.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v3 2/3 drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
In reply to a message not in the archiveThis 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.
--- 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(-)
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2 -2
@@ -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 ; }
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1 -1
@@ -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,
drivers/gpu/drm/msm/adreno/a5xx_power.c +1 -1
@@ -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 ;
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +1 -1
@@ -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 ; } }
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -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);
drivers/gpu/drm/msm/msm_gem_submit.c +2 -2
@@ -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);
Signature · 6 lines
2.19.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): [email protected]
Jordan Crouse
Reviewed-byRe: [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
Quoted 3 lines · Thomas Zimmermann
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.
Quoted 112 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- 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(-)drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2
-2@@ -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 ; }drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-1@@ -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,drivers/gpu/drm/msm/adreno/a5xx_power.c +1
-1@@ -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 ;drivers/gpu/drm/msm/adreno/a5xx_preempt.c +1
-1@@ -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 ; } }drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-1@@ -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);drivers/gpu/drm/msm/msm_gem_submit.c +2
-2@@ -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);Signature · 6 lines
2.19.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20180926162317.GJ10761-9PYrDHPZ2Orvke4nUoYGnHL1okKdlPRT@public.gmane.org
Re: [PATCH v3 2/3] drm/msm: Replace drm_gem_object_{un/reference} with put, get functions
Quoted 6 lines · Jordan Crouse
Quoted 3 lines · Thomas Zimmermann
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 <[email protected]>
Care to review all 3 and then push them? Or is msm still not yet group maintained :-)
Cheers, Daniel
Quoted 121 lines
Quoted 113 lines
Signed-off-by Thomas Zimmermann <[email protected]>--- 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(-)drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2
-2@@ -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 ; }drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1
-1@@ -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,drivers/gpu/drm/msm/adreno/a5xx_power.c +1
-1@@ -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 ;drivers/gpu/drm/msm/adreno/a5xx_preempt.c +1
-1@@ -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 ; } }drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1
-1@@ -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);drivers/gpu/drm/msm/msm_gem_submit.c +2
-2@@ -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);Signature · 6 lines
2.19.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedrenoSignature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v3 3/3 drm/msm: Replace drm_dev_unref with drm_dev_put
In reply to a message not in the archiveThis 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.
--- drivers/gpu/drm/msm/msm_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +4 -4
@@ -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; }
Signature · 6 lines
2.19.0 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno