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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index 7ce1c2f87d9a7ccbce4c84596d1206afa8bdef1e..bb9d95ef0707f497bc5cc8709b860c0b9dd49b6d 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index cd607ba9c2fed484f6895f91d7abf4be4cb2b4f4..b7fb9b79bfef13feec810459b32071ca1f144d96 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -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))
-               return buf;
-       return NULL;
+       ttm_bo_get(&buf->base);
+       return buf;
 }
 
 static inline struct ttm_mem_global *vmw_mem_glob(struct vmw_private *dev_priv)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 3025bfc001a1d2302fb902b5c38b08b88f330e15..d67b928adf6a641d0b69eb68443cef9699929172 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -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);