From: Cihangir Akturk <cakturk@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Cihangir Akturk <cakturk@gmail.com>,
Mark Yao <mark.yao@rock-chips.com>,
David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 21/29] drm/rockchip: switch to drm_*{get,put} helpers
Date: Thu, 3 Aug 2017 14:58:36 +0300 [thread overview]
Message-ID: <1501761585-11757-22-git-send-email-cakturk@gmail.com> (raw)
In-Reply-To: <1501761585-11757-1-git-send-email-cakturk@gmail.com>
drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() adn should not be
used by new code. So convert all users of compatibility functions to use
the new APIs.
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
next prev parent reply other threads:[~2017-08-03 12:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1501761585-11757-1-git-send-email-cakturk@gmail.com>
2017-08-03 11:58 ` [PATCH 01/29] drm/amdgpu: switch to drm_*{get,put} helpers Cihangir Akturk
2017-08-03 12:08 ` Christian König
2017-08-03 11:58 ` [PATCH 02/29] drm: mali-dp: " Cihangir Akturk
2017-08-03 14:02 ` Liviu Dudau
2017-08-03 11:58 ` [PATCH 03/29] drm/armada: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 04/29] drm/ast: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 05/29] drm/atmel-hlcdc: " Cihangir Akturk
2017-08-03 12:10 ` Boris Brezillon
2017-08-03 14:55 ` Boris Brezillon
2017-08-03 11:58 ` [PATCH 06/29] drm/bochs: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 07/29] drm/cirrus: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 08/29] drm/etnaviv: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 09/29] drm/exynos: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 10/29] drm/gma500: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 11/29] drm/hisilicon: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 12/29] drm/i915: " Cihangir Akturk
2017-08-03 12:26 ` Jani Nikula
2017-08-03 12:49 ` Daniel Vetter
2017-08-03 15:52 ` Cihangir Akturk
2017-08-07 9:10 ` Daniel Vetter
2017-08-03 15:36 ` Cihangir Akturk
2017-08-04 8:18 ` Jani Nikula
2017-08-03 11:58 ` [PATCH 13/29] drm/imx: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 14/29] drm/mediatek: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 15/29] drm/mgag200: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 16/29] drm/msm: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 17/29] drm/nouveau: " Cihangir Akturk
2017-08-03 13:05 ` Tobias Klausmann
2017-08-03 11:58 ` [PATCH 18/29] drm/omap: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 19/29] drm/qxl: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 20/29] drm/radeon: " Cihangir Akturk
2017-08-03 12:08 ` Christian König
2017-08-03 16:27 ` Alex Deucher
2017-08-03 11:58 ` Cihangir Akturk [this message]
2017-08-03 11:58 ` [PATCH 22/29] drm/tegra: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 23/29] drm/tilcdc: " Cihangir Akturk
2017-08-03 13:56 ` Jyri Sarha
2017-08-03 15:42 ` Daniel Vetter
2017-08-03 17:37 ` Jyri Sarha
2017-08-03 11:58 ` [PATCH 24/29] drm/udl: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 25/29] drm/vc4: " Cihangir Akturk
2017-08-08 20:39 ` Eric Anholt
2017-08-03 11:58 ` [PATCH 26/29] drm/vgem: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 27/29] drm/virtio: " Cihangir Akturk
2017-08-03 11:58 ` [PATCH 28/29] drm/vmwgfx: " Cihangir Akturk
2017-08-03 12:40 ` Thomas Hellstrom
2017-08-03 13:06 ` Daniel Vetter
2017-08-03 11:58 ` [PATCH 29/29] staging: vboxvideo: " 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=1501761585-11757-22-git-send-email-cakturk@gmail.com \
--to=cakturk@gmail.com \
--cc=airlied@linux.ie \
--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;
as well as URLs for NNTP newsgroup(s).