On Mon, Oct 23, 2017 at 10:08:06PM +0530, Aastha Gupta wrote:
> DRM core uses reference/unreference suffixes for refcounting
> functions, but kernel uses get/put (e.g. kref_get/put()).
> Replace reference/unreference with get/put for consistency
> and also it's shorter.
>
> The following cocci script was used to generate the patch:
>
> @@
> expression e;
> @@
>
> (
> -drm_gem_object_reference(e);
> +drm_gem_object_get(e);
> |
> -drm_gem_object_unreference(e);
> +drm_gem_object_put(e);
> |
> -drm_gem_object_unreference_unlocked(e);
> +drm_gem_object_put_unlocked(e);
> )
>
> Signed-off-by: Aastha Gupta <aastha.gupta4104@xxxxxxxxx>
Applied, thanks for your patch.
-Daniel
> ---
> 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 72ad7b1..92fb277 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;
> @@ -130,7 +130,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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
