From: Cihangir Akturk <cakturk@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: "Cihangir Akturk" <cakturk@gmail.com>,
"Ben Skeggs" <bskeggs@redhat.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 17/29] drm/nouveau: switch to drm_*{get,put} helpers
Date: Thu, 3 Aug 2017 14:58:32 +0300 [thread overview]
Message-ID: <1501761585-11757-18-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/nouveau/dispnv04/crtc.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_display.c | 8 ++++----
drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_gem.c | 14 +++++++-------
drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 4b4b0b4..18b4be1 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -1019,7 +1019,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
nv_crtc->cursor.show(nv_crtc, true);
out:
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return ret;
}
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index f98f800..3e9db5a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -136,7 +136,7 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16,
if (chan->ntfy) {
nouveau_bo_vma_del(chan->ntfy, &chan->ntfy_vma);
nouveau_bo_unpin(chan->ntfy);
- drm_gem_object_unreference_unlocked(&chan->ntfy->gem);
+ drm_gem_object_put_unlocked(&chan->ntfy->gem);
}
if (chan->heap.block_size)
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 8d1df56..a68fe1a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -206,7 +206,7 @@ nouveau_user_framebuffer_destroy(struct drm_framebuffer *drm_fb)
struct nouveau_framebuffer *fb = nouveau_framebuffer(drm_fb);
if (fb->nvbo)
- drm_gem_object_unreference_unlocked(&fb->nvbo->gem);
+ drm_gem_object_put_unlocked(&fb->nvbo->gem);
drm_framebuffer_cleanup(drm_fb);
kfree(fb);
@@ -267,7 +267,7 @@ nouveau_user_framebuffer_create(struct drm_device *dev,
if (ret == 0)
return &fb->base;
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return ERR_PTR(ret);
}
@@ -947,7 +947,7 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,
return ret;
ret = drm_gem_handle_create(file_priv, &bo->gem, &args->handle);
- drm_gem_object_unreference_unlocked(&bo->gem);
+ drm_gem_object_put_unlocked(&bo->gem);
return ret;
}
@@ -962,7 +962,7 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv,
if (gem) {
struct nouveau_bo *bo = nouveau_gem_object(gem);
*poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 2665a07..6c9e1ec 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -451,7 +451,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)
nouveau_bo_vma_del(nouveau_fb->nvbo, &nouveau_fb->vma);
nouveau_bo_unmap(nouveau_fb->nvbo);
nouveau_bo_unpin(nouveau_fb->nvbo);
- drm_framebuffer_unreference(&nouveau_fb->base);
+ drm_framebuffer_put(&nouveau_fb->base);
}
return 0;
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 2170534..653425c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -281,7 +281,7 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
}
/* drop reference from allocate - handle holds it now */
- drm_gem_object_unreference_unlocked(&nvbo->gem);
+ drm_gem_object_put_unlocked(&nvbo->gem);
return ret;
}
@@ -350,7 +350,7 @@ validate_fini_no_ticket(struct validate_op *op, struct nouveau_fence *fence,
list_del(&nvbo->entry);
nvbo->reserved_by = NULL;
ttm_bo_unreserve_ticket(&nvbo->bo, &op->ticket);
- drm_gem_object_unreference_unlocked(&nvbo->gem);
+ drm_gem_object_put_unlocked(&nvbo->gem);
}
}
@@ -396,14 +396,14 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
nvbo = nouveau_gem_object(gem);
if (nvbo == res_bo) {
res_bo = NULL;
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
continue;
}
if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {
NV_PRINTK(err, cli, "multiple instances of buffer %d on "
"validation list\n", b->handle);
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
ret = -EINVAL;
break;
}
@@ -877,7 +877,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
ret = lret;
nouveau_bo_sync_for_cpu(nvbo);
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return ret;
}
@@ -896,7 +896,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data,
nvbo = nouveau_gem_object(gem);
nouveau_bo_sync_for_device(nvbo);
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return 0;
}
@@ -913,7 +913,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data,
return -ENOENT;
ret = nouveau_gem_info(file_priv, gem, req);
- drm_gem_object_unreference_unlocked(gem);
+ drm_gem_object_put_unlocked(gem);
return ret;
}
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index e3132a2..e57b2e8 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3237,7 +3237,7 @@ nv50_mstm_destroy_connector(struct drm_dp_mst_topology_mgr *mgr,
mstc->port = NULL;
drm_modeset_unlock_all(drm->dev);
- drm_connector_unreference(&mstc->connector);
+ drm_connector_put(&mstc->connector);
}
static void
--
2.7.4
next prev parent reply other threads:[~2017-08-03 12:02 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 ` Cihangir Akturk [this message]
2017-08-03 13:05 ` [PATCH 17/29] drm/nouveau: " 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 ` [PATCH 21/29] drm/rockchip: " Cihangir Akturk
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-18-git-send-email-cakturk@gmail.com \
--to=cakturk@gmail.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=bskeggs@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.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).