From: Christian König Date: Wed, 15 Aug 2018 17:10:40 +0000 (+0200) Subject: drm/amdgpu: validate the VM root PD from the VM code X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=262b9c392e7dbe264b075fa5ad6a0de5a403da7a;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: validate the VM root PD from the VM code Preparation for following changes. This validates the root PD twice, but the overhead of that should be minimal. Signed-off-by: Christian König Reviewed-by: Junwei Zhang Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 995ad5e83611..7d7d7e532246 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -291,11 +291,11 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) { struct amdgpu_bo *bo = bo_base->bo; - if (bo->parent) { - r = validate(param, bo); - if (r) - break; + r = validate(param, bo); + if (r) + break; + if (bo->parent) { spin_lock(&glob->lru_lock); ttm_bo_move_to_lru_tail(&bo->tbo); if (bo->shadow)