Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1709559
| From | Cihangir Akturk <cakturk@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 26/28] drm/virtio: switch to drm_*_get(), drm_*_put() helpers |
| Date | 2017-08-11 14:40 +0200 |
| Message-ID | <udhon-3ww-59@gated-at.bofh.it> (permalink) |
| References | <udhol-3ww-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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/virtio/virtgpu_display.c | 4 ++--
drivers/gpu/drm/virtio/virtgpu_gem.c | 4 ++--
drivers/gpu/drm/virtio/virtgpu_ioctl.c | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index b6d5205..41b0930 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -53,7 +53,7 @@ static void virtio_gpu_user_framebuffer_destroy(struct drm_framebuffer *fb)
struct virtio_gpu_framebuffer *virtio_gpu_fb
= to_virtio_gpu_framebuffer(fb);
- drm_gem_object_unreference_unlocked(virtio_gpu_fb->obj);
+ drm_gem_object_put_unlocked(virtio_gpu_fb->obj);
drm_framebuffer_cleanup(fb);
kfree(virtio_gpu_fb);
}
@@ -327,7 +327,7 @@ virtio_gpu_user_framebuffer_create(struct drm_device *dev,
ret = virtio_gpu_framebuffer_init(dev, virtio_gpu_fb, mode_cmd, obj);
if (ret) {
kfree(virtio_gpu_fb);
- drm_gem_object_unreference_unlocked(obj);
+ drm_gem_object_put_unlocked(obj);
return NULL;
}
diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index cc025d8..78da210 100644
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -72,7 +72,7 @@ int virtio_gpu_gem_create(struct drm_file *file,
*obj_p = &obj->gem_base;
/* drop reference from allocate - handle holds it now */
- drm_gem_object_unreference_unlocked(&obj->gem_base);
+ drm_gem_object_put_unlocked(&obj->gem_base);
*handle_p = handle;
return 0;
@@ -137,7 +137,7 @@ int virtio_gpu_mode_dumb_mmap(struct drm_file *file_priv,
return -ENOENT;
obj = gem_to_virtio_gpu_obj(gobj);
*offset_p = virtio_gpu_object_mmap_offset(obj);
- drm_gem_object_unreference_unlocked(gobj);
+ drm_gem_object_put_unlocked(gobj);
return 0;
}
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
index b94bd54..461f81a 100644
--- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c
+++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -86,7 +86,7 @@ static void virtio_gpu_unref_list(struct list_head *head)
bo = buf->bo;
qobj = container_of(bo, struct virtio_gpu_object, tbo);
- drm_gem_object_unreference_unlocked(&qobj->gem_base);
+ drm_gem_object_put_unlocked(&qobj->gem_base);
}
}
@@ -261,7 +261,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
ret = virtio_gpu_object_attach(vgdev, qobj, res_id, NULL);
} else {
/* use a gem reference since unref list undoes them */
- drm_gem_object_reference(&qobj->gem_base);
+ drm_gem_object_get(&qobj->gem_base);
mainbuf.bo = &qobj->tbo;
list_add(&mainbuf.head, &validate_list);
@@ -304,7 +304,7 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data,
}
return ret;
}
- drm_gem_object_unreference_unlocked(obj);
+ drm_gem_object_put_unlocked(obj);
rc->res_handle = res_id; /* similiar to a VM address */
rc->bo_handle = handle;
@@ -341,7 +341,7 @@ static int virtio_gpu_resource_info_ioctl(struct drm_device *dev, void *data,
ri->size = qobj->gem_base.size;
ri->res_handle = qobj->hw_res_handle;
- drm_gem_object_unreference_unlocked(gobj);
+ drm_gem_object_put_unlocked(gobj);
return 0;
}
@@ -389,7 +389,7 @@ static int virtio_gpu_transfer_from_host_ioctl(struct drm_device *dev,
out_unres:
virtio_gpu_object_unreserve(qobj);
out:
- drm_gem_object_unreference_unlocked(gobj);
+ drm_gem_object_put_unlocked(gobj);
return ret;
}
@@ -439,7 +439,7 @@ static int virtio_gpu_transfer_to_host_ioctl(struct drm_device *dev, void *data,
out_unres:
virtio_gpu_object_unreserve(qobj);
out:
- drm_gem_object_unreference_unlocked(gobj);
+ drm_gem_object_put_unlocked(gobj);
return ret;
}
@@ -462,7 +462,7 @@ static int virtio_gpu_wait_ioctl(struct drm_device *dev, void *data,
nowait = true;
ret = virtio_gpu_object_wait(qobj, nowait);
- drm_gem_object_unreference_unlocked(gobj);
+ drm_gem_object_put_unlocked(gobj);
return ret;
}
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v3 00/28] DRM API Conversions Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 05/28] drm/bochs: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 23/28] drm/udl: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
Re: [PATCH v3 23/28] drm/udl: switch to drm_*_get(), drm_*_put() helpers Sean Paul <seanpaul@chromium.org> - 2017-08-11 18:10 +0200
[PATCH v3 15/28] drm/msm: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 26/28] drm/virtio: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 16/28] drm/nouveau: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 14/28] drm/mgag200: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
Re: [PATCH v3 14/28] drm/mgag200: switch to drm_*_get(), drm_*_put() helpers Sean Paul <seanpaul@chromium.org> - 2017-08-11 18:10 +0200
[PATCH v3 07/28] drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
Re: [PATCH v3 07/28] drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers Lucas Stach <l.stach@pengutronix.de> - 2017-08-11 16:50 +0200
Re: [PATCH v3 07/28] drm/etnaviv: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 17:10 +0200
[PATCH v3 13/28] drm/mediatek: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
Re: [PATCH v3 13/28] drm/mediatek: switch to drm_*_get(), drm_*_put() helpers Philipp Zabel <p.zabel@pengutronix.de> - 2017-08-11 15:10 +0200
Re: [PATCH v3 13/28] drm/mediatek: switch to drm_*_get(), drm_*_put() helpers Sean Paul <seanpaul@chromium.org> - 2017-08-11 18:10 +0200
[PATCH v3 22/28] drm/tilcdc: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:40 +0200
[PATCH v3 02/28] drm: mali-dp: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:50 +0200
[PATCH v3 09/28] drm/gma500: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:50 +0200
[PATCH v3 08/28] drm/exynos: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:50 +0200
[PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:50 +0200
Re: [PATCH v3 11/28] drm/i915: switch to drm_*_get(), drm_*_put() helpers Daniel Vetter <daniel@ffwll.ch> - 2017-08-11 18:20 +0200
[PATCH] drm/i915: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-13 15:40 +0200
[PATCH v3 06/28] drm/cirrus: switch to drm_*_get(), drm_*_put() helpers Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 14:50 +0200
Re: [PATCH v3 06/28] drm/cirrus: switch to drm_*_get(), drm_*_put() helpers Sean Paul <seanpaul@chromium.org> - 2017-08-11 18:10 +0200
RE: [PATCH v3 00/28] DRM API Conversions "Deucher, Alexander" <Alexander.Deucher@amd.com> - 2017-08-11 16:30 +0200
Re: [PATCH v3 00/28] DRM API Conversions Cihangir Akturk <cakturk@gmail.com> - 2017-08-11 17:30 +0200
csiph-web