drm/amdgpu: revert "cleanup setting bulk_movable"
authorChristian König <christian.koenig@amd.com>
Wed, 13 Mar 2019 08:36:52 +0000 (09:36 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 19 Mar 2019 18:57:24 +0000 (13:57 -0500)
This reverts commit 8466cc61da89d33441e0d7a98de1ba98697cd465.

It can trigger a reference counter bug in TTM. Need to investigate further, but
for now revert the offending change.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

index bfa9062ce6b9fed957a5e52c592dc57ff257a02e..16fcb56c232b55eef2e36027b624ddb6986aa68d 100644 (file)
@@ -700,6 +700,8 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        struct amdgpu_vm_bo_base *bo_base, *tmp;
        int r = 0;
 
+       vm->bulk_moveable &= list_empty(&vm->evicted);
+
        list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) {
                struct amdgpu_bo *bo = bo_base->bo;