Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753547AbdHKQD3 (ORCPT ); Fri, 11 Aug 2017 12:03:29 -0400 Received: from mail-yw0-f169.google.com ([209.85.161.169]:33814 "EHLO mail-yw0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989AbdHKQD2 (ORCPT ); Fri, 11 Aug 2017 12:03:28 -0400 Date: Fri, 11 Aug 2017 12:03:25 -0400 From: Sean Paul To: Cihangir Akturk Cc: Heiko Stuebner , linux-rockchip@lists.infradead.org, David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, linux-arm-kernel@lists.infradead.org, Mark Yao Subject: Re: [PATCH v3 20/28] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers Message-ID: <20170811160325.553z6yjocbmbeyn6@art_vandelay> References: <1502454794-28558-1-git-send-email-cakturk@gmail.com> <1502454794-28558-21-git-send-email-cakturk@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1502454794-28558-21-git-send-email-cakturk@gmail.com> User-Agent: NeoMutt/20170306-66-6ddb52-dirty (1.8.0) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4320 Lines: 114 On Fri, Aug 11, 2017 at 03:33:06PM +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 Applied to drm-misc-next, thank you! 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 | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c > index 8a0f756..7077304 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 f74333e..1869c8b 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; > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > index 948719d..bf9ed0e 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c > @@ -1026,7 +1026,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc, > if (old_plane_state->fb == new_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); > @@ -1150,7 +1150,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