Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d18cb98 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Alex Deucher
Browse files

drm/vmwgfx: Replace ttm_bo_reference with ttm_bo_get 



The function ttm_bo_get acquires a reference on a TTM buffer object. The
function's name is more aligned to the Linux kernel convention of naming
ref-counting function _get and _put.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 829eee62

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

+3 −2
Original line number Diff line number Diff line
@@ -614,7 +614,8 @@ int vmw_user_bo_alloc(struct vmw_private *dev_priv, 
	if (unlikely(ret != 0))

		return ret;



	tmp = ttm_bo_reference(&user_bo->vbo.base);

	ttm_bo_get(&user_bo->vbo.base);

	tmp = &user_bo->vbo.base;

	ret = ttm_prime_object_init(tfile,

				    size,

				    &user_bo->prime,
@@ -911,7 +912,7 @@ int vmw_user_bo_lookup(struct ttm_object_file *tfile, 


	vmw_user_bo = container_of(base, struct vmw_user_buffer_object,

				   prime.base);

	(void)ttm_bo_reference(&vmw_user_bo->vbo.base);

	ttm_bo_get(&vmw_user_bo->vbo.base);

	if (p_base)

		*p_base = base;

	else

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+2 −3
Original line number Diff line number Diff line
@@ -1346,9 +1346,8 @@ static inline void vmw_bo_unreference(struct vmw_buffer_object **buf) 
static inline struct vmw_buffer_object *

vmw_bo_reference(struct vmw_buffer_object *buf)

{

	if (ttm_bo_reference(&buf->base))

	ttm_bo_get(&buf->base);

	return buf;

	return NULL;

}



static inline struct ttm_mem_global *vmw_mem_glob(struct vmw_private *dev_priv)

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+2 −1
Original line number Diff line number Diff line
@@ -461,7 +461,8 @@ vmw_resource_check_buffer(struct ww_acquire_ctx *ticket, 
	}



	INIT_LIST_HEAD(&val_list);

	val_buf->bo = ttm_bo_reference(&res->backup->base);

	ttm_bo_get(&res->backup->base);

	val_buf->bo = &res->backup->base;

	val_buf->num_shared = 0;

	list_add_tail(&val_buf->head, &val_list);

	ret = ttm_eu_reserve_buffers(ticket, &val_list, interruptible, NULL);