Commit 2f44172b authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: use the new cursor in amdgpu_ttm_bo_eviction_valuable 



Separate the drm_mm_node walking from the actual handling.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarOak Zeng <Oak.Zeng@amd.com>
Tested-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarArunpravin <Arunpravin.PaneerSelvam@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 755eadf6

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+8 −6
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, 
					    const struct ttm_place *place)

{

	unsigned long num_pages = bo->mem.num_pages;

	struct drm_mm_node *node = bo->mem.mm_node;

	struct amdgpu_res_cursor cursor;

	struct dma_resv_list *flist;

	struct dma_fence *f;

	int i;
@@ -1430,13 +1430,15 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, 


	case TTM_PL_VRAM:

		/* Check each drm MM node individually */

		while (num_pages) {

			if (place->fpfn < (node->start + node->size) &&

			    !(place->lpfn && place->lpfn <= node->start))

		amdgpu_res_first(&bo->mem, 0, (u64)num_pages << PAGE_SHIFT,

				 &cursor);

		while (cursor.remaining) {

			if (place->fpfn < PFN_DOWN(cursor.start + cursor.size)

			    && !(place->lpfn &&

				 place->lpfn <= PFN_DOWN(cursor.start)))

				return true;



			num_pages -= node->size;

			++node;

			amdgpu_res_next(&cursor, cursor.size);

		}

		return false;