From: Christian König Date: Fri, 1 Sep 2017 12:46:19 +0000 (+0200) Subject: drm/amdgpu: fix moved list handling in the VM X-Git-Tag: v4.15-rc1~56^2~28^2~161 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=481c2e94897eb74abcfb4a3cdb87f5f89499b93f;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu: fix moved list handling in the VM Only move BOs to the moved/relocated list when they aren't already on a list. This prevents accidential removal from the evicted list. Signed-off-by: Christian König Reviewed-by: Alex Deucher 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 b83e0fa1f269f..c9223a5184dee 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1178,7 +1178,8 @@ static void amdgpu_vm_invalidate_level(struct amdgpu_vm *vm, entry->addr = ~0ULL; spin_lock(&vm->status_lock); - list_move(&entry->base.vm_status, &vm->relocated); + if (list_empty(&entry->base.vm_status)) + list_add(&entry->base.vm_status, &vm->relocated); spin_unlock(&vm->status_lock); amdgpu_vm_invalidate_level(vm, entry); } @@ -2091,7 +2092,8 @@ static void amdgpu_vm_bo_insert_map(struct amdgpu_device *adev, if (bo && bo->tbo.resv == vm->root.base.bo->tbo.resv) { spin_lock(&vm->status_lock); - list_move(&bo_va->base.vm_status, &vm->moved); + if (list_empty(&bo_va->base.vm_status)) + list_add(&bo_va->base.vm_status, &vm->moved); spin_unlock(&vm->status_lock); } trace_amdgpu_vm_bo_map(bo_va, mapping); @@ -2446,7 +2448,8 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, } spin_lock(&bo_base->vm->status_lock); - list_move(&bo_base->vm_status, &bo_base->vm->moved); + if (list_empty(&bo_base->vm_status)) + list_add(&bo_base->vm_status, &vm->moved); spin_unlock(&bo_base->vm->status_lock); } }