Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d7d4d3a authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: rework moved handling in the VM v2 



Instead of using the vm_state use a separate flag to note
that the BO was moved.

v2: reorder patches to avoid temporary lockless access

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 08cab989

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+10 −3
Original line number Diff line number Diff line
@@ -1788,10 +1788,16 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, 
	else

		flags = 0x0;



	if (!clear && bo_va->base.moved) {

		bo_va->base.moved = false;

		list_splice_init(&bo_va->valids, &bo_va->invalids);



	} else {

		spin_lock(&vm->status_lock);

		if (!list_empty(&bo_va->base.vm_status))

			list_splice_init(&bo_va->valids, &bo_va->invalids);

		spin_unlock(&vm->status_lock);

	}



	list_for_each_entry(mapping, &bo_va->invalids, list) {

		r = amdgpu_vm_bo_split_mapping(adev, exclusive, pages_addr, vm,
@@ -2419,6 +2425,7 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, 
	struct amdgpu_vm_bo_base *bo_base;



	list_for_each_entry(bo_base, &bo->va, bo_list) {

		bo_base->moved = true;

		spin_lock(&bo_base->vm->status_lock);

		if (list_empty(&bo_base->vm_status))

			list_add(&bo_base->vm_status,

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,9 @@ struct amdgpu_vm_bo_base { 


	/* protected by spinlock */

	struct list_head		vm_status;



	/* protected by the BO being reserved */

	bool				moved;

};



struct amdgpu_vm_pt {