Commit 0678c15b authored by Zhaoyu Liu's avatar Zhaoyu Liu Committed by Christian König
Browse files

drm/ttm: use ttm_resource_unevictable() to replace pin_count and swapped 



TTM always uses pin_count and ttm_resource_is_swapped() together to
determine whether a BO is unevictable.
Now use ttm_resource_unevictable() to replace them.

Signed-off-by: default avatarZhaoyu Liu <liuzhaoyu.zackary@bytedance.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250126093256.GA688734@bytedance


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 011529fe

drivers/gpu/drm/ttm/ttm_resource.c

+10 −5
Original line number Diff line number Diff line
@@ -269,11 +269,16 @@ static bool ttm_resource_is_swapped(struct ttm_resource *res, struct ttm_buffer_ 
	return ttm_tt_is_swapped(bo->ttm);

}



static bool ttm_resource_unevictable(struct ttm_resource *res, struct ttm_buffer_object *bo)

{

	return bo->pin_count || ttm_resource_is_swapped(res, bo);

}



/* Add the resource to a bulk move if the BO is configured for it */

void ttm_resource_add_bulk_move(struct ttm_resource *res,

				struct ttm_buffer_object *bo)

{

	if (bo->bulk_move && !bo->pin_count && !ttm_resource_is_swapped(res, bo))

	if (bo->bulk_move && !ttm_resource_unevictable(res, bo))

		ttm_lru_bulk_move_add(bo->bulk_move, res);

}
@@ -281,7 +286,7 @@ void ttm_resource_add_bulk_move(struct ttm_resource *res, 
void ttm_resource_del_bulk_move(struct ttm_resource *res,

				struct ttm_buffer_object *bo)

{

	if (bo->bulk_move && !bo->pin_count && !ttm_resource_is_swapped(res, bo))

	if (bo->bulk_move && !ttm_resource_unevictable(res, bo))

		ttm_lru_bulk_move_del(bo->bulk_move, res);

}
@@ -293,7 +298,7 @@ void ttm_resource_move_to_lru_tail(struct ttm_resource *res) 


	lockdep_assert_held(&bo->bdev->lru_lock);



	if (bo->pin_count || ttm_resource_is_swapped(res, bo)) {

	if (ttm_resource_unevictable(res, bo)) {

		list_move_tail(&res->lru.link, &bdev->unevictable);



	} else if (bo->bulk_move) {
@@ -335,7 +340,7 @@ void ttm_resource_init(struct ttm_buffer_object *bo, 


	man = ttm_manager_type(bo->bdev, place->mem_type);

	spin_lock(&bo->bdev->lru_lock);

	if (bo->pin_count || ttm_resource_is_swapped(res, bo))

	if (ttm_resource_unevictable(res, bo))

		list_add_tail(&res->lru.link, &bo->bdev->unevictable);

	else

		list_add_tail(&res->lru.link, &man->lru[bo->priority]);