drm/amdgpu: cleanup amdgpu_vm_validate_pt_bos v2

Use list_for_each_entry_safe here.

v2: Drop the optimization, it doesn't work as expected.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@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 f0deedc..3be4d5f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -224,21 +224,16 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                              void *param)
 {
        struct ttm_bo_global *glob = adev->mman.bdev.glob;
-       int r;
-
-       while (!list_empty(&vm->evicted)) {
-               struct amdgpu_vm_bo_base *bo_base;
-               struct amdgpu_bo *bo;
+       struct amdgpu_vm_bo_base *bo_base, *tmp;
+       int r = 0;
 
-               bo_base = list_first_entry(&vm->evicted,
-                                          struct amdgpu_vm_bo_base,
-                                          vm_status);
+       list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) {
+               struct amdgpu_bo *bo = bo_base->bo;
 
-               bo = bo_base->bo;
                if (bo->parent) {
                        r = validate(param, bo);
                        if (r)
-                               return r;
+                               break;
 
                        spin_lock(&glob->lru_lock);
                        ttm_bo_move_to_lru_tail(&bo->tbo);
@@ -251,7 +246,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                    vm->use_cpu_for_update) {
                        r = amdgpu_bo_kmap(bo, NULL);
                        if (r)
-                               return r;
+                               break;
                }
 
                if (bo->tbo.type != ttm_bo_type_kernel) {
@@ -263,7 +258,7 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
                }
        }
 
-       return 0;
+       return r;
 }
 
 /**