Commit 391629bd authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: remove amdgpu_vm_pt 



Page table entries are now in embedded in VM BO, so
we do not need struct amdgpu_vm_pt. This patch replaces
struct amdgpu_vm_pt with struct amdgpu_vm_bo_base.

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

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

+13 −13
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static int amdgpu_amdkfd_validate_vm_bo(void *_unused, struct amdgpu_bo *bo) 
 */

static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm)

{

	struct amdgpu_bo *pd = vm->root.base.bo;

	struct amdgpu_bo *pd = vm->root.bo;

	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);

	int ret;
@@ -372,7 +372,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) 
		return ret;

	}



	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);

	vm->pd_phys_addr = amdgpu_gmc_pd_addr(vm->root.bo);



	if (vm->use_cpu_for_update) {

		ret = amdgpu_bo_kmap(pd, NULL);
@@ -387,7 +387,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) 


static int vm_update_pds(struct amdgpu_vm *vm, struct amdgpu_sync *sync)

{

	struct amdgpu_bo *pd = vm->root.base.bo;

	struct amdgpu_bo *pd = vm->root.bo;

	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);

	int ret;
@@ -1153,7 +1153,7 @@ static int process_sync_pds_resv(struct amdkfd_process_info *process_info, 


	list_for_each_entry(peer_vm, &process_info->vm_list_head,

			    vm_list_node) {

		struct amdgpu_bo *pd = peer_vm->root.base.bo;

		struct amdgpu_bo *pd = peer_vm->root.bo;



		ret = amdgpu_sync_resv(NULL, sync, pd->tbo.base.resv,

				       AMDGPU_SYNC_NE_OWNER,
@@ -1220,7 +1220,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, 
	vm->process_info = *process_info;



	/* Validate page directory and attach eviction fence */

	ret = amdgpu_bo_reserve(vm->root.base.bo, true);

	ret = amdgpu_bo_reserve(vm->root.bo, true);

	if (ret)

		goto reserve_pd_fail;

	ret = vm_validate_pt_pd_bos(vm);
@@ -1228,16 +1228,16 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, 
		pr_err("validate_pt_pd_bos() failed\n");

		goto validate_pd_fail;

	}

	ret = amdgpu_bo_sync_wait(vm->root.base.bo,

	ret = amdgpu_bo_sync_wait(vm->root.bo,

				  AMDGPU_FENCE_OWNER_KFD, false);

	if (ret)

		goto wait_pd_fail;

	ret = dma_resv_reserve_shared(vm->root.base.bo->tbo.base.resv, 1);

	ret = dma_resv_reserve_shared(vm->root.bo->tbo.base.resv, 1);

	if (ret)

		goto reserve_shared_fail;

	amdgpu_bo_fence(vm->root.base.bo,

	amdgpu_bo_fence(vm->root.bo,

			&vm->process_info->eviction_fence->base, true);

	amdgpu_bo_unreserve(vm->root.base.bo);

	amdgpu_bo_unreserve(vm->root.bo);



	/* Update process info */

	mutex_lock(&vm->process_info->lock);
@@ -1251,7 +1251,7 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, 
reserve_shared_fail:

wait_pd_fail:

validate_pd_fail:

	amdgpu_bo_unreserve(vm->root.base.bo);

	amdgpu_bo_unreserve(vm->root.bo);

reserve_pd_fail:

	vm->process_info = NULL;

	if (info) {
@@ -1306,7 +1306,7 @@ void amdgpu_amdkfd_gpuvm_destroy_cb(struct amdgpu_device *adev, 
				    struct amdgpu_vm *vm)

{

	struct amdkfd_process_info *process_info = vm->process_info;

	struct amdgpu_bo *pd = vm->root.base.bo;

	struct amdgpu_bo *pd = vm->root.bo;



	if (!process_info)

		return;
@@ -1362,7 +1362,7 @@ void amdgpu_amdkfd_gpuvm_release_process_vm(struct kgd_dev *kgd, void *drm_priv) 
uint64_t amdgpu_amdkfd_gpuvm_get_process_page_dir(void *drm_priv)

{

	struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);

	struct amdgpu_bo *pd = avm->root.base.bo;

	struct amdgpu_bo *pd = avm->root.bo;

	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);



	if (adev->asic_type < CHIP_VEGA10)
@@ -2389,7 +2389,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
	/* Attach eviction fence to PD / PT BOs */

	list_for_each_entry(peer_vm, &process_info->vm_list_head,

			    vm_list_node) {

		struct amdgpu_bo *bo = peer_vm->root.base.bo;

		struct amdgpu_bo *bo = peer_vm->root.bo;



		amdgpu_bo_fence(bo, &process_info->eviction_fence->base, true);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.base.bo);

	p->job->vm_pd_addr = amdgpu_gmc_pd_addr(vm->root.bo);



	if (amdgpu_vm_debug) {

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1304,11 +1304,11 @@ static int amdgpu_debugfs_vm_info_show(struct seq_file *m, void *unused) 


		seq_printf(m, "pid:%d\tProcess:%s ----------\n",

				vm->task_info.pid, vm->task_info.process_name);

		r = amdgpu_bo_reserve(vm->root.base.bo, true);

		r = amdgpu_bo_reserve(vm->root.bo, true);

		if (r)

			break;

		amdgpu_debugfs_vm_bo_info(vm, m);

		amdgpu_bo_unreserve(vm->root.base.bo);

		amdgpu_bo_unreserve(vm->root.bo);

	}



	mutex_unlock(&dev->filelist_mutex);

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

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ amdgpu_dma_buf_move_notify(struct dma_buf_attachment *attach) 


	for (bo_base = bo->vm_bo; bo_base; bo_base = bo_base->next) {

		struct amdgpu_vm *vm = bo_base->vm;

		struct dma_resv *resv = vm->root.base.bo->tbo.base.resv;

		struct dma_resv *resv = vm->root.bo->tbo.base.resv;



		if (ticket) {

			/* When we get an error here it means that somebody

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

+2 −2
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ void amdgpu_show_fdinfo(struct seq_file *m, struct file *f) 
	dev = PCI_SLOT(adev->pdev->devfn);

	fn = PCI_FUNC(adev->pdev->devfn);



	ret = amdgpu_bo_reserve(fpriv->vm.root.base.bo, false);

	ret = amdgpu_bo_reserve(fpriv->vm.root.bo, false);

	if (ret) {

		DRM_ERROR("Fail to reserve bo\n");

		return;

	}

	amdgpu_vm_get_memory(&fpriv->vm, &vram_mem, &gtt_mem, &cpu_mem);

	amdgpu_bo_unreserve(fpriv->vm.root.base.bo);

	amdgpu_bo_unreserve(fpriv->vm.root.bo);

	seq_printf(m, "pdev:\t%04x:%02x:%02x.%d\npasid:\t%u\n", domain, bus,

			dev, fn, fpriv->vm.pasid);

	seq_printf(m, "vram mem:\t%llu kB\n", vram_mem/1024UL);