openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: further optimize amdgpu_vm_handle_moved 

Splice the moved list to a local one to avoid taking the lock over and
over again.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-04-19 11:08:24 +02:00 committed by Alex Deucher
parent 91ccdd24a1
commit 789f3317ed
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1781,19 +1781,18 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
int amdgpu_vm_handle_moved(struct amdgpu_device *adev, int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
struct amdgpu_vm *vm) struct amdgpu_vm *vm)
{ {
struct amdgpu_bo_va *bo_va, *tmp;
struct list_head moved;
bool clear; bool clear;
int r = 0; int r;
INIT_LIST_HEAD(&moved);
spin_lock(&vm->moved_lock); spin_lock(&vm->moved_lock);
while (!list_empty(&vm->moved)) { list_splice_init(&vm->moved, &moved);
struct amdgpu_bo_va *bo_va; spin_unlock(&vm->moved_lock);
struct reservation_object *resv;
bo_va = list_first_entry(&vm->moved, list_for_each_entry_safe(bo_va, tmp, &moved, base.vm_status) {
struct amdgpu_bo_va, base.vm_status); struct reservation_object *resv = bo_va->base.bo->tbo.resv;
spin_unlock(&vm->moved_lock);
resv = bo_va->base.bo->tbo.resv;
/* Per VM BOs never need to bo cleared in the page tables */ /* Per VM BOs never need to bo cleared in the page tables */
if (resv == vm->root.base.bo->tbo.resv) if (resv == vm->root.base.bo->tbo.resv)
@ -1806,17 +1805,19 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
clear = true; clear = true;
r = amdgpu_vm_bo_update(adev, bo_va, clear); r = amdgpu_vm_bo_update(adev, bo_va, clear);
if (r) if (r) {
spin_lock(&vm->moved_lock);
list_splice(&moved, &vm->moved);
spin_unlock(&vm->moved_lock);
return r; return r;
}
if (!clear && resv != vm->root.base.bo->tbo.resv) if (!clear && resv != vm->root.base.bo->tbo.resv)
reservation_object_unlock(resv); reservation_object_unlock(resv);
spin_lock(&vm->moved_lock);
} }
spin_unlock(&vm->moved_lock);
return r; return 0;
} }
/** /**