drm/amdgpu: move VM BOs on LRU again

Move all BOs belonging to a VM on the LRU with every submission.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index f5dee4c..ccba88c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -251,6 +251,19 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                }
        }
 
+       spin_lock(&glob->lru_lock);
+       list_for_each_entry(bo_base, &vm->idle, vm_status) {
+               struct amdgpu_bo *bo = bo_base->bo;
+
+               if (!bo->parent)
+                       continue;
+
+               ttm_bo_move_to_lru_tail(&bo->tbo);
+               if (bo->shadow)
+                       ttm_bo_move_to_lru_tail(&bo->shadow->tbo);
+       }
+       spin_unlock(&glob->lru_lock);
+
        return r;
 }
 
@@ -965,7 +978,7 @@ restart:
                                           struct amdgpu_vm_bo_base,
                                           vm_status);
                bo_base->moved = false;
-               list_del_init(&bo_base->vm_status);
+               list_move(&bo_base->vm_status, &vm->idle);
 
                bo = bo_base->bo->parent;
                if (!bo)
@@ -1571,10 +1584,14 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev,
         * the evicted list so that it gets validated again on the
         * next command submission.
         */
-       if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv &&
-           !(bo->preferred_domains &
-           amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type)))
-               list_add_tail(&bo_va->base.vm_status, &vm->evicted);
+       if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) {
+               uint32_t mem_type = bo->tbo.mem.mem_type;
+
+               if (!(bo->preferred_domains & amdgpu_mem_type_to_domain(mem_type)))
+                       list_add_tail(&bo_va->base.vm_status, &vm->evicted);
+               else
+                       list_add(&bo_va->base.vm_status, &vm->idle);
+       }
 
        list_splice_init(&bo_va->invalids, &bo_va->valids);
        bo_va->cleared = clear;
@@ -2368,6 +2385,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        INIT_LIST_HEAD(&vm->relocated);
        spin_lock_init(&vm->moved_lock);
        INIT_LIST_HEAD(&vm->moved);
+       INIT_LIST_HEAD(&vm->idle);
        INIT_LIST_HEAD(&vm->freed);
 
        /* create scheduler entity for page table updates */

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 0196b9a..061b99a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -178,6 +178,9 @@ struct amdgpu_vm {
        struct list_head        moved;
        spinlock_t              moved_lock;
 
+       /* All BOs of this VM not currently in the state machine */
+       struct list_head        idle;
+
        /* BO mappings freed, but not yet updated in the PT */
        struct list_head        freed;