drm/amdgpu: user BO priority instead of self coding it (v2)

Keeping groups of BOs on the LRU is to time consuming on command submission.

Instead use the newly added BO priority to give a certain eviction order.

v2: agd: trivial warning fix

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Roger.He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 2 insertions, 67 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d53445074897..6b1f85b1a1cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -1048,56 +1048,6 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,
         return flags;
 }
 
-static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo)
-{
-        struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-        unsigned i, j;
-
-        for (i = 0; i < AMDGPU_TTM_LRU_SIZE; ++i) {
-                struct amdgpu_mman_lru *lru = &adev->mman.log2_size[i];
-
-                for (j = 0; j < TTM_NUM_MEM_TYPES; ++j)
-                        if (&tbo->lru == lru->lru[j])
-                                lru->lru[j] = tbo->lru.prev;
-
-                if (&tbo->swap == lru->swap_lru)
-                        lru->swap_lru = tbo->swap.prev;
-        }
-}
-
-static struct amdgpu_mman_lru *amdgpu_ttm_lru(struct ttm_buffer_object *tbo)
-{
-        struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
-        unsigned log2_size = min(ilog2(tbo->num_pages),
-                                 AMDGPU_TTM_LRU_SIZE - 1);
-
-        return &adev->mman.log2_size[log2_size];
-}
-
-static struct list_head *amdgpu_ttm_lru_tail(struct ttm_buffer_object *tbo)
-{
-        struct amdgpu_mman_lru *lru = amdgpu_ttm_lru(tbo);
-        struct list_head *res = lru->lru[tbo->mem.mem_type];
-
-        lru->lru[tbo->mem.mem_type] = &tbo->lru;
-        while ((++lru)->lru[tbo->mem.mem_type] == res)
-                lru->lru[tbo->mem.mem_type] = &tbo->lru;
-
-        return res;
-}
-
-static struct list_head *amdgpu_ttm_swap_lru_tail(struct ttm_buffer_object *tbo)
-{
-        struct amdgpu_mman_lru *lru = amdgpu_ttm_lru(tbo);
-        struct list_head *res = lru->swap_lru;
-
-        lru->swap_lru = &tbo->swap;
-        while ((++lru)->swap_lru == res)
-                lru->swap_lru = &tbo->swap;
-
-        return res;
-}
-
 static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,
                                             const struct ttm_place *place)
 {
@@ -1136,14 +1086,12 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
         .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
         .io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
         .io_mem_free = &amdgpu_ttm_io_mem_free,
-        .lru_removal = &amdgpu_ttm_lru_removal,
-        .lru_tail = &amdgpu_ttm_lru_tail,
-        .swap_lru_tail = &amdgpu_ttm_swap_lru_tail,
+        .lru_tail = &ttm_bo_default_lru_tail,
+        .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
 };
 
 int amdgpu_ttm_init(struct amdgpu_device *adev)
 {
-        unsigned i, j;
         int r;
 
         r = amdgpu_ttm_global_init(adev);
@@ -1161,19 +1109,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
                 DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
                 return r;
         }
-
-        for (i = 0; i < AMDGPU_TTM_LRU_SIZE; ++i) {
-                struct amdgpu_mman_lru *lru = &adev->mman.log2_size[i];
-
-                for (j = 0; j < TTM_NUM_MEM_TYPES; ++j)
-                        lru->lru[j] = &adev->mman.bdev.man[j].lru[0];
-                lru->swap_lru = &adev->mman.bdev.glob->swap_lru[0];
-        }
-
-        for (j = 0; j < TTM_NUM_MEM_TYPES; ++j)
-                adev->mman.guard.lru[j] = NULL;
-        adev->mman.guard.swap_lru = NULL;
-
         adev->mman.initialized = true;
         r = ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_VRAM,
                                 adev->mc.real_vram_size >> PAGE_SHIFT);