aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2019-01-28 07:41:58 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-02-19 15:58:27 -0500
commit8466cc61da89d33441e0d7a98de1ba98697cd465 (patch)
tree11a8a240e635cdfbbe571cb15780beb877dfb62d /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
parentbcb35dad1d3181e3cb4e5ac067bfc4aed53c592c (diff)
drm/amdgpu: cleanup setting bulk_movable
We only need to set this to false now when BOs are removed from the LRU. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 6dda415bb3ee..d4c733885e87 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -332,7 +332,6 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
332 if (bo->tbo.resv != vm->root.base.bo->tbo.resv) 332 if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
333 return; 333 return;
334 334
335 vm->bulk_moveable = false;
336 if (bo->tbo.type == ttm_bo_type_kernel) 335 if (bo->tbo.type == ttm_bo_type_kernel)
337 amdgpu_vm_bo_relocated(base); 336 amdgpu_vm_bo_relocated(base);
338 else 337 else
@@ -698,8 +697,6 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
698 struct amdgpu_vm_bo_base *bo_base, *tmp; 697 struct amdgpu_vm_bo_base *bo_base, *tmp;
699 int r = 0; 698 int r = 0;
700 699
701 vm->bulk_moveable &= list_empty(&vm->evicted);
702
703 list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) { 700 list_for_each_entry_safe(bo_base, tmp, &vm->evicted, vm_status) {
704 struct amdgpu_bo *bo = bo_base->bo; 701 struct amdgpu_bo *bo = bo_base->bo;
705 702
@@ -2758,9 +2755,6 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
2758 struct amdgpu_vm_bo_base **base; 2755 struct amdgpu_vm_bo_base **base;
2759 2756
2760 if (bo) { 2757 if (bo) {
2761 if (bo->tbo.resv == vm->root.base.bo->tbo.resv)
2762 vm->bulk_moveable = false;
2763
2764 for (base = &bo_va->base.bo->vm_bo; *base; 2758 for (base = &bo_va->base.bo->vm_bo; *base;
2765 base = &(*base)->next) { 2759 base = &(*base)->next) {
2766 if (*base != &bo_va->base) 2760 if (*base != &bo_va->base)