diff options
| author | Christian König <[email protected]> | 2018-10-18 12:29:28 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2018-10-25 19:04:40 +0000 |
| commit | 0af5c656fdb797f74ee57414e0c07cd57406d0c3 (patch) | |
| tree | 0ffabe681c3f80a1909954df74a41ede03fccfab /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
| parent | drm/amd/powerplay: commonize the API for retrieving current clocks (diff) | |
| download | kernel-0af5c656fdb797f74ee57414e0c07cd57406d0c3.tar.gz kernel-0af5c656fdb797f74ee57414e0c07cd57406d0c3.zip | |
drm/amdgpu: fix amdgpu_vm_fini
We should not remove mappings in rbtree_postorder_for_each_entry_safe
because that rebalances the tree.
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Chunming Zhou <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index 6904d794d60a..db0cbf8d219d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -3234,8 +3234,10 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) } rbtree_postorder_for_each_entry_safe(mapping, tmp, &vm->va.rb_root, rb) { + /* Don't remove the mapping here, we don't want to trigger a + * rebalance and the tree is about to be destroyed anyway. + */ list_del(&mapping->list); - amdgpu_vm_it_remove(mapping, &vm->va); kfree(mapping); } list_for_each_entry_safe(mapping, tmp, &vm->freed, list) { |