* [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers [not found] <1502367012-9417-1-git-send-email-cakturk@gmail.com> @ 2017-08-10 12:10 ` Cihangir Akturk 2017-08-10 18:16 ` Sean Paul 0 siblings, 1 reply; 4+ messages in thread From: Cihangir Akturk @ 2017-08-10 12:10 UTC (permalink / raw) Cc: daniel, linux-kernel, dri-devel, Cihangir Akturk, Mark Yao, David Airlie, Heiko Stuebner, linux-arm-kernel, linux-rockchip Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() and drm_*_unreference() helpers. drm_*_reference() and drm_*_unreference() functions are just compatibility alias for drm_*_get() and drm_*_put() and should not be used by new code. So convert all users of compatibility functions to use the new APIs. Generated by: scripts/coccinelle/api/drm-get-put.cocci Signed-off-by: Cihangir Akturk <cakturk@gmail.com> --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +++--- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 ++-- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 81f9548..a933b58 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -48,7 +48,7 @@ static void rockchip_drm_fb_destroy(struct drm_framebuffer *fb) int i; for (i = 0; i < ROCKCHIP_MAX_FB_BUFFER; i++) - drm_gem_object_unreference_unlocked(rockchip_fb->obj[i]); + drm_gem_object_put_unlocked(rockchip_fb->obj[i]); drm_framebuffer_cleanup(fb); kfree(rockchip_fb); @@ -144,7 +144,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, width * drm_format_plane_cpp(mode_cmd->pixel_format, i); if (obj->size < min_size) { - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); ret = -EINVAL; goto err_gem_object_unreference; } @@ -161,7 +161,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, err_gem_object_unreference: for (i--; i >= 0; i--) - drm_gem_object_unreference_unlocked(objs[i]); + drm_gem_object_put_unlocked(objs[i]); return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index ce946b9..724579e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -173,7 +173,7 @@ void rockchip_drm_fbdev_fini(struct drm_device *dev) drm_fb_helper_unregister_fbi(helper); if (helper->fb) - drm_framebuffer_unreference(helper->fb); + drm_framebuffer_put(helper->fb); drm_fb_helper_fini(helper); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index b74ac71..9f880d0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -383,7 +383,7 @@ rockchip_gem_create_with_handle(struct drm_file *file_priv, goto err_handle_create; /* drop reference from allocate - handle holds it now. */ - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return rk_obj; @@ -414,7 +414,7 @@ int rockchip_gem_dumb_map_offset(struct drm_file *file_priv, DRM_DEBUG_KMS("offset = 0x%llx\n", *offset); out: - drm_gem_object_unreference_unlocked(obj); + drm_gem_object_put_unlocked(obj); return 0; } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 5d45033..12e17e6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1065,7 +1065,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc, if (old_plane_state->fb == plane->state->fb) continue; - drm_framebuffer_reference(old_plane_state->fb); + drm_framebuffer_get(old_plane_state->fb); drm_flip_work_queue(&vop->fb_unref_work, old_plane_state->fb); set_bit(VOP_PENDING_FB_UNREF, &vop->pending); WARN_ON(drm_crtc_vblank_get(crtc) != 0); @@ -1189,7 +1189,7 @@ static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) struct drm_framebuffer *fb = val; drm_crtc_vblank_put(&vop->crtc); - drm_framebuffer_unreference(fb); + drm_framebuffer_put(fb); } static void vop_handle_vblank(struct vop *vop) -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers 2017-08-10 12:10 ` [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk @ 2017-08-10 18:16 ` Sean Paul 2017-08-10 19:52 ` Cihangir Akturk 0 siblings, 1 reply; 4+ messages in thread From: Sean Paul @ 2017-08-10 18:16 UTC (permalink / raw) To: Cihangir Akturk; +Cc: linux-kernel, dri-devel, linux-rockchip, linux-arm-kernel On Thu, Aug 10, 2017 at 03:10:04PM +0300, Cihangir Akturk wrote: > Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() > and drm_*_unreference() helpers. > > drm_*_reference() and drm_*_unreference() functions are just > compatibility alias for drm_*_get() and drm_*_put() and should not be > used by new code. So convert all users of compatibility functions to > use the new APIs. > > Generated by: scripts/coccinelle/api/drm-get-put.cocci > > Signed-off-by: Cihangir Akturk <cakturk@gmail.com> Hi Cihangir, Thank you for the patch. Unfortunately it does not apply to drm-misc-next. Could you please resend with conflicts resolved? Thanks, Sean > --- > drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +++--- > drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 ++-- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > index 81f9548..a933b58 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > @@ -48,7 +48,7 @@ static void rockchip_drm_fb_destroy(struct drm_framebuffer *fb) > int i; > > for (i = 0; i < ROCKCHIP_MAX_FB_BUFFER; i++) > - drm_gem_object_unreference_unlocked(rockchip_fb->obj[i]); > + drm_gem_object_put_unlocked(rockchip_fb->obj[i]); > > drm_framebuffer_cleanup(fb); > kfree(rockchip_fb); > @@ -144,7 +144,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, > width * drm_format_plane_cpp(mode_cmd->pixel_format, i); > > if (obj->size < min_size) { > - drm_gem_object_unreference_unlocked(obj); > + drm_gem_object_put_unlocked(obj); > ret = -EINVAL; > goto err_gem_object_unreference; > } > @@ -161,7 +161,7 @@ rockchip_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, > > err_gem_object_unreference: > for (i--; i >= 0; i--) > - drm_gem_object_unreference_unlocked(objs[i]); > + drm_gem_object_put_unlocked(objs[i]); > return ERR_PTR(ret); > } > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c > index ce946b9..724579e 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c > @@ -173,7 +173,7 @@ void rockchip_drm_fbdev_fini(struct drm_device *dev) > drm_fb_helper_unregister_fbi(helper); > > if (helper->fb) > - drm_framebuffer_unreference(helper->fb); > + drm_framebuffer_put(helper->fb); > > drm_fb_helper_fini(helper); > } > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index b74ac71..9f880d0 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -383,7 +383,7 @@ rockchip_gem_create_with_handle(struct drm_file *file_priv, > goto err_handle_create; > > /* drop reference from allocate - handle holds it now. */ > - drm_gem_object_unreference_unlocked(obj); > + drm_gem_object_put_unlocked(obj); > > return rk_obj; > > @@ -414,7 +414,7 @@ int rockchip_gem_dumb_map_offset(struct drm_file *file_priv, > DRM_DEBUG_KMS("offset = 0x%llx\n", *offset); > > out: > - drm_gem_object_unreference_unlocked(obj); > + drm_gem_object_put_unlocked(obj); > > return 0; > } > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 5d45033..12e17e6 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1065,7 +1065,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc, > if (old_plane_state->fb == plane->state->fb) > continue; > > - drm_framebuffer_reference(old_plane_state->fb); > + drm_framebuffer_get(old_plane_state->fb); > drm_flip_work_queue(&vop->fb_unref_work, old_plane_state->fb); > set_bit(VOP_PENDING_FB_UNREF, &vop->pending); > WARN_ON(drm_crtc_vblank_get(crtc) != 0); > @@ -1189,7 +1189,7 @@ static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) > struct drm_framebuffer *fb = val; > > drm_crtc_vblank_put(&vop->crtc); > - drm_framebuffer_unreference(fb); > + drm_framebuffer_put(fb); > } > > static void vop_handle_vblank(struct vop *vop) > -- > 2.7.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers 2017-08-10 18:16 ` Sean Paul @ 2017-08-10 19:52 ` Cihangir Akturk 2017-08-10 19:55 ` Sean Paul 0 siblings, 1 reply; 4+ messages in thread From: Cihangir Akturk @ 2017-08-10 19:52 UTC (permalink / raw) To: Sean Paul Cc: Heiko Stuebner, linux-rockchip, David Airlie, linux-kernel, dri-devel, daniel, linux-arm-kernel, Mark Yao On Thu, Aug 10, 2017 at 02:16:08PM -0400, Sean Paul wrote: > On Thu, Aug 10, 2017 at 03:10:04PM +0300, Cihangir Akturk wrote: > > Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() > > and drm_*_unreference() helpers. > > > > drm_*_reference() and drm_*_unreference() functions are just > > compatibility alias for drm_*_get() and drm_*_put() and should not be > > used by new code. So convert all users of compatibility functions to > > use the new APIs. > > > > Generated by: scripts/coccinelle/api/drm-get-put.cocci > > > > Signed-off-by: Cihangir Akturk <cakturk@gmail.com> > > Hi Cihangir, > Thank you for the patch. Unfortunately it does not apply to drm-misc-next. Could > you please resend with conflicts resolved? OK, I'll send a v3 based on drm-next. And should I drop patches from v1 already pulled in drm-next? Thanks, Cihangir > > Thanks, > > Sean > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers 2017-08-10 19:52 ` Cihangir Akturk @ 2017-08-10 19:55 ` Sean Paul 0 siblings, 0 replies; 4+ messages in thread From: Sean Paul @ 2017-08-10 19:55 UTC (permalink / raw) To: Cihangir Akturk Cc: Linux Kernel Mailing List, dri-devel, open list:ARM/Rockchip SoC..., Linux ARM Kernel On Thu, Aug 10, 2017 at 3:52 PM, Cihangir Akturk <cakturk@gmail.com> wrote: > On Thu, Aug 10, 2017 at 02:16:08PM -0400, Sean Paul wrote: >> On Thu, Aug 10, 2017 at 03:10:04PM +0300, Cihangir Akturk wrote: >> > Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference() >> > and drm_*_unreference() helpers. >> > >> > drm_*_reference() and drm_*_unreference() functions are just >> > compatibility alias for drm_*_get() and drm_*_put() and should not be >> > used by new code. So convert all users of compatibility functions to >> > use the new APIs. >> > >> > Generated by: scripts/coccinelle/api/drm-get-put.cocci >> > >> > Signed-off-by: Cihangir Akturk <cakturk@gmail.com> >> >> Hi Cihangir, >> Thank you for the patch. Unfortunately it does not apply to drm-misc-next. Could >> you please resend with conflicts resolved? > > OK, I'll send a v3 based on drm-next. *drm-misc-next > And should I drop patches from > v1 already pulled in drm-next? > yes please Sean > Thanks, Cihangir > >> >> Thanks, >> >> Sean >> _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-08-10 19:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1502367012-9417-1-git-send-email-cakturk@gmail.com>
2017-08-10 12:10 ` [PATCH v2 21/29] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-10 18:16 ` Sean Paul
2017-08-10 19:52 ` Cihangir Akturk
2017-08-10 19:55 ` Sean Paul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox