UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: fix idle state and bulk_moveable flag 

Add BOs to the idle state again and correctly clear the flag when
new BOs are added.

Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-08-31 11:08:06 +02:00 committed by Alex Deucher
parent b995795bf0
commit 5d35ed4832
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
View File

@ -156,12 +156,15 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
return; return;
list_add_tail(&base->bo_list, &bo->va); list_add_tail(&base->bo_list, &bo->va);
if (bo->tbo.type == ttm_bo_type_kernel)
list_move(&base->vm_status, &vm->relocated);
if (bo->tbo.resv != vm->root.base.bo->tbo.resv) if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
return; return;
vm->bulk_moveable = false;
if (bo->tbo.type == ttm_bo_type_kernel)
list_move(&base->vm_status, &vm->relocated);
else
list_move(&base->vm_status, &vm->idle);
if (bo->preferred_domains & if (bo->preferred_domains &
amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type)) amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type))
return; return;
@ -1121,7 +1124,7 @@ restart:
struct amdgpu_vm_bo_base, struct amdgpu_vm_bo_base,
vm_status); vm_status);
bo_base->moved = false; bo_base->moved = false;
list_del_init(&bo_base->vm_status); list_move(&bo_base->vm_status, &vm->idle);
bo = bo_base->bo->parent; bo = bo_base->bo->parent;
if (!bo) if (!bo)
@ -2646,7 +2649,6 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,
return r; return r;
vm->pte_support_ats = false; vm->pte_support_ats = false;
vm->bulk_moveable = true;
if (vm_context == AMDGPU_VM_CONTEXT_COMPUTE) { if (vm_context == AMDGPU_VM_CONTEXT_COMPUTE) {
vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode & vm->use_cpu_for_update = !!(adev->vm_manager.vm_update_mode &