drm/amdgpu: handle multi level PD in the LRU

Move all levels to the end after command submission.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 c15d9b7..d48ea0f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -201,28 +201,46 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 }
 
 /**
- * amdgpu_vm_move_pt_bos_in_lru - move the PT BOs to the LRU tail
+ * amdgpu_vm_move_level_in_lru - move one level of PT BOs to the LRU tail
  *
  * @adev: amdgpu device instance
  * @vm: vm providing the BOs
  *
  * Move the PT BOs to the tail of the LRU.
  */
-void amdgpu_vm_move_pt_bos_in_lru(struct amdgpu_device *adev,
-                                 struct amdgpu_vm *vm)
+static void amdgpu_vm_move_level_in_lru(struct amdgpu_vm_pt *parent)
 {
-       struct ttm_bo_global *glob = adev->mman.bdev.glob;
        unsigned i;
 
-       spin_lock(&glob->lru_lock);
-       for (i = 0; i <= vm->root.last_entry_used; ++i) {
-               struct amdgpu_bo *bo = vm->root.entries[i].bo;
+       if (!parent->entries)
+               return;
 
-               if (!bo)
+       for (i = 0; i <= parent->last_entry_used; ++i) {
+               struct amdgpu_vm_pt *entry = &parent->entries[i];
+
+               if (!entry->bo)
                        continue;
 
-               ttm_bo_move_to_lru_tail(&bo->tbo);
+               ttm_bo_move_to_lru_tail(&entry->bo->tbo);
+               amdgpu_vm_move_level_in_lru(entry);
        }
+}
+
+/**
+ * amdgpu_vm_move_pt_bos_in_lru - move the PT BOs to the LRU tail
+ *
+ * @adev: amdgpu device instance
+ * @vm: vm providing the BOs
+ *
+ * Move the PT BOs to the tail of the LRU.
+ */
+void amdgpu_vm_move_pt_bos_in_lru(struct amdgpu_device *adev,
+                                 struct amdgpu_vm *vm)
+{
+       struct ttm_bo_global *glob = adev->mman.bdev.glob;
+
+       spin_lock(&glob->lru_lock);
+       amdgpu_vm_move_level_in_lru(&vm->root);
        spin_unlock(&glob->lru_lock);
 }