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

drm/amdgpu: add amdgpu_vm_pt_parent helper 



Add a function to get the parent of a PD/PT.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7893499e

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

+23 −13
Original line number Diff line number Diff line
@@ -337,6 +337,24 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base, 
	amdgpu_vm_bo_evicted(base);

}



/**

 * amdgpu_vm_pt_parent - get the parent page directory

 *

 * @pt: child page table

 *

 * Helper to get the parent entry for the child page table. NULL if we are at

 * the root page directory.

 */

static struct amdgpu_vm_pt *amdgpu_vm_pt_parent(struct amdgpu_vm_pt *pt)

{

	struct amdgpu_bo *parent = pt->base.bo->parent;



	if (!parent)

		return NULL;



	return list_first_entry(&parent->va, struct amdgpu_vm_pt, base.bo_list);

}



/**

 * amdgpu_vm_get_pd_bo - add the VM PD to a validation list

 *
@@ -1206,24 +1224,16 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev, 
	}



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

		struct amdgpu_vm_bo_base *bo_base, *parent;

		struct amdgpu_vm_pt *pt, *entry;

		struct amdgpu_bo *bo;



		bo_base = list_first_entry(&vm->relocated,

					   struct amdgpu_vm_bo_base,

					   vm_status);

		amdgpu_vm_bo_idle(bo_base);

		entry = list_first_entry(&vm->relocated, struct amdgpu_vm_pt,

					 base.vm_status);

		amdgpu_vm_bo_idle(&entry->base);



		bo = bo_base->bo->parent;

		if (!bo)

		pt = amdgpu_vm_pt_parent(entry);

		if (!pt)

			continue;



		parent = list_first_entry(&bo->va, struct amdgpu_vm_bo_base,

					  bo_list);

		pt = container_of(parent, struct amdgpu_vm_pt, base);

		entry = container_of(bo_base, struct amdgpu_vm_pt, base);



		amdgpu_vm_update_pde(&params, vm, pt, entry);



		if (!vm->use_cpu_for_update &&