Commit 31fa8642 authored by Huang Xiaojia's avatar Huang Xiaojia
Browse files

drm/vmwgfx: Remove vmw_user_bo_noref_release 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALIFE



--------------------------------

Remove vmw_user_bo_noref_release and its caller.
Replace vmw_user_bo_noref_release with  ttm_bo_put.

Fixes: e14c02e6 ("drm/vmwgfx: Look up objects without taking a reference")
Signed-off-by: default avatarHuang Xiaojia <huangxiaojia2@huawei.com>
parent b781114d

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −9
Original line number Diff line number Diff line
@@ -881,15 +881,6 @@ extern void vmw_bo_swap_notify(struct ttm_buffer_object *bo); 
extern struct vmw_buffer_object *

vmw_user_bo_noref_lookup(struct ttm_object_file *tfile, u32 handle);



/**

 * vmw_user_bo_noref_release - release a buffer object pointer looked up

 * without reference

 */

static inline void vmw_user_bo_noref_release(void)

{

	ttm_base_object_noref_release();

}



/**

 * vmw_bo_adjust_prio - Adjust the buffer object eviction priority

 * according to attached resources

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int vmw_translate_mob_ptr(struct vmw_private *dev_priv, 
	}



	ret = vmw_validation_add_bo(sw_context->ctx, vmw_bo, true, false);

	vmw_user_bo_noref_release();

	ttm_bo_put(&vmw_bo->base);

	if (unlikely(ret != 0))

		return ret;
@@ -1228,7 +1228,7 @@ static int vmw_translate_guest_ptr(struct vmw_private *dev_priv, 
	}



	ret = vmw_validation_add_bo(sw_context->ctx, vmw_bo, false, false);

	vmw_user_bo_noref_release();

	ttm_bo_put(&vmw_bo->base);

	if (unlikely(ret != 0))

		return ret;