From: Cihangir Akturk <cakturk@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: daniel@ffwll.ch, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org,
Cihangir Akturk <cakturk@gmail.com>,
Mark Yao <mark.yao@rock-chips.com>,
David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org
Subject: [PATCH v3 20/28] drm/rockchip: switch to drm_*_get(), drm_*_put() helpers
Date: Fri, 11 Aug 2017 15:33:06 +0300 [thread overview]
Message-ID: <1502454794-28558-21-git-send-email-cakturk@gmail.com> (raw)
In-Reply-To: <1502454794-28558-1-git-send-email-cakturk@gmail.com>
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 | 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
next prev parent reply other threads:[~2017-08-11 12:35 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 12:32 [PATCH v3 00/28] DRM API Conversions Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 01/28] drm/amdgpu: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 02/28] drm: mali-dp: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 03/28] drm/armada: " Cihangir Akturk
2017-08-17 9:13 ` Russell King - ARM Linux
2017-08-11 12:32 ` [PATCH v3 04/28] drm/ast: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 05/28] drm/bochs: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 06/28] drm/cirrus: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 07/28] drm/etnaviv: " Cihangir Akturk
2017-08-11 14:43 ` Lucas Stach
2017-08-11 15:01 ` Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 08/28] drm/exynos: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 09/28] drm/gma500: " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 10/28] drm/hisilicon: " Cihangir Akturk
2017-08-11 16:02 ` Sean Paul
2017-08-11 12:32 ` [PATCH v3 11/28] drm/i915: " Cihangir Akturk
2017-08-11 16:11 ` Daniel Vetter
2017-08-13 13:30 ` [PATCH] " Cihangir Akturk
2017-08-11 12:32 ` [PATCH v3 12/28] drm/imx: " Cihangir Akturk
2017-08-11 13:01 ` Philipp Zabel
2017-08-11 12:32 ` [PATCH v3 13/28] drm/mediatek: " Cihangir Akturk
2017-08-11 13:01 ` Philipp Zabel
2017-08-11 16:04 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 14/28] drm/mgag200: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 15/28] drm/msm: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 16/28] drm/nouveau: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 17/28] drm/omapdrm: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 18/28] drm/qxl: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 19/28] drm/radeon: " Cihangir Akturk
2017-08-11 12:33 ` Cihangir Akturk [this message]
2017-08-11 16:03 ` [PATCH v3 20/28] drm/rockchip: " Sean Paul
2017-08-11 12:33 ` [PATCH v3 21/28] drm/tegra: " Cihangir Akturk
2017-08-17 15:33 ` Thierry Reding
2017-08-11 12:33 ` [PATCH v3 22/28] drm/tilcdc: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 23/28] drm/udl: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 24/28] drm/vc4: " Cihangir Akturk
2017-08-14 19:47 ` Eric Anholt
2017-08-14 20:06 ` Cihangir Akturk
2017-08-14 21:11 ` Eric Anholt
2017-08-11 12:33 ` [PATCH v3 25/28] drm/vgem: " Cihangir Akturk
2017-08-11 16:03 ` Sean Paul
2017-08-11 12:33 ` [PATCH v3 26/28] drm/virtio: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 27/28] drm/vmwgfx: " Cihangir Akturk
2017-08-11 12:33 ` [PATCH v3 28/28] drm: vboxvideo: " Cihangir Akturk
2017-08-11 13:26 ` Hans de Goede
2017-08-11 16:04 ` Sean Paul
2017-08-11 16:11 ` Hans de Goede
2017-08-11 17:27 ` Sean Paul
2017-08-14 8:58 ` Daniel Vetter
2017-08-14 12:23 ` Hans de Goede
2017-08-11 14:24 ` [PATCH v3 00/28] DRM API Conversions Deucher, Alexander
2017-08-11 15:21 ` Cihangir Akturk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502454794-28558-21-git-send-email-cakturk@gmail.com \
--to=cakturk@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.yao@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®