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

Commit 27c7b9ae authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: rename VM invalidated to moved 



That better describes what happens here with the BO.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ec681545

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

+1 −1
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) 


	}



	r = amdgpu_vm_clear_invalids(adev, vm, &p->job->sync);

	r = amdgpu_vm_clear_moved(adev, vm, &p->job->sync);



	if (amdgpu_vm_debug && p->bo_list) {

		/* Invalidate all BOs to test for userspace bugs */

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

+8 −8
Original line number Diff line number Diff line
@@ -1983,25 +1983,25 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, 
}



/**

 * amdgpu_vm_clear_invalids - clear invalidated BOs in the PT

 * amdgpu_vm_clear_moved - clear moved BOs in the PT

 *

 * @adev: amdgpu_device pointer

 * @vm: requested vm

 *

 * Make sure all invalidated BOs are cleared in the PT.

 * Make sure all moved BOs are cleared in the PT.

 * Returns 0 for success.

 *

 * PTs have to be reserved and mutex must be locked!

 */

int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,

			     struct amdgpu_vm *vm, struct amdgpu_sync *sync)

int amdgpu_vm_clear_moved(struct amdgpu_device *adev, struct amdgpu_vm *vm,

			    struct amdgpu_sync *sync)

{

	struct amdgpu_bo_va *bo_va = NULL;

	int r = 0;



	spin_lock(&vm->status_lock);

	while (!list_empty(&vm->invalidated)) {

		bo_va = list_first_entry(&vm->invalidated,

	while (!list_empty(&vm->moved)) {

		bo_va = list_first_entry(&vm->moved,

			struct amdgpu_bo_va, base.vm_status);

		spin_unlock(&vm->status_lock);
@@ -2396,7 +2396,7 @@ void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev, 
		spin_lock(&bo_base->vm->status_lock);

		if (list_empty(&bo_base->vm_status))

			list_add(&bo_base->vm_status,

				 &bo_base->vm->invalidated);

				 &bo_base->vm->moved);

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

	}

}
@@ -2465,7 +2465,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++)

		vm->reserved_vmid[i] = NULL;

	spin_lock_init(&vm->status_lock);

	INIT_LIST_HEAD(&vm->invalidated);

	INIT_LIST_HEAD(&vm->moved);

	INIT_LIST_HEAD(&vm->cleared);

	INIT_LIST_HEAD(&vm->freed);

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

+3 −3
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ struct amdgpu_vm { 
	spinlock_t		status_lock;



	/* BOs moved, but not yet updated in the PT */

	struct list_head	invalidated;

	struct list_head	moved;



	/* BOs cleared in the PT because of a move */

	struct list_head	cleared;
@@ -247,7 +247,7 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev, 
int amdgpu_vm_clear_freed(struct amdgpu_device *adev,

			  struct amdgpu_vm *vm,

			  struct dma_fence **fence);

int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, struct amdgpu_vm *vm,

int amdgpu_vm_clear_moved(struct amdgpu_device *adev, struct amdgpu_vm *vm,

			  struct amdgpu_sync *sync);

int amdgpu_vm_bo_update(struct amdgpu_device *adev,

			struct amdgpu_bo_va *bo_va,