Commit b809ca91 authored by Jesse.Zhang's avatar Jesse.Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Merge amdgpu_vm_set_pasid into amdgpu_vm_init 

As KFD no longer uses a separate PASID, the global amdgpu_vm_set_pasid()function is no longer necessary.
Merge its functionality directly intoamdgpu_vm_init() to simplify code flow and eliminate redundant locking.

v2: remove superflous check
  adjust amdgpu_vm_fin and remove amdgpu_vm_set_pasid (Chritian)

v3: drop amdgpu_vm_assert_locked (Chritian)

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4614


Fixes: 59e4405e ("drm/amdgpu: revert to old status lock handling v3")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8dbac5cf

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

+2 −8
Original line number Diff line number Diff line
@@ -1421,14 +1421,10 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 


	amdgpu_debugfs_vm_init(file_priv);



	r = amdgpu_vm_init(adev, &fpriv->vm, fpriv->xcp_id);

	r = amdgpu_vm_init(adev, &fpriv->vm, fpriv->xcp_id, pasid);

	if (r)

		goto error_pasid;



	r = amdgpu_vm_set_pasid(adev, &fpriv->vm, pasid);

	if (r)

		goto error_vm;



	fpriv->prt_va = amdgpu_vm_bo_add(adev, &fpriv->vm, NULL);

	if (!fpriv->prt_va) {

		r = -ENOMEM;
@@ -1468,10 +1464,8 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
	amdgpu_vm_fini(adev, &fpriv->vm);



error_pasid:

	if (pasid) {

	if (pasid)

		amdgpu_pasid_free(pasid);

		amdgpu_vm_set_pasid(adev, &fpriv->vm, 0);

	}



	kfree(fpriv);

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

+21 −44
Original line number Diff line number Diff line
@@ -138,48 +138,6 @@ static void amdgpu_vm_assert_locked(struct amdgpu_vm *vm) 
	dma_resv_assert_held(vm->root.bo->tbo.base.resv);

}



/**

 * amdgpu_vm_set_pasid - manage pasid and vm ptr mapping

 *

 * @adev: amdgpu_device pointer

 * @vm: amdgpu_vm pointer

 * @pasid: the pasid the VM is using on this GPU

 *

 * Set the pasid this VM is using on this GPU, can also be used to remove the

 * pasid by passing in zero.

 *

 */

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

			u32 pasid)

{

	int r;



	amdgpu_vm_assert_locked(vm);



	if (vm->pasid == pasid)

		return 0;



	if (vm->pasid) {

		r = xa_err(xa_erase_irq(&adev->vm_manager.pasids, vm->pasid));

		if (r < 0)

			return r;



		vm->pasid = 0;

	}



	if (pasid) {

		r = xa_err(xa_store_irq(&adev->vm_manager.pasids, pasid, vm,

					GFP_KERNEL));

		if (r < 0)

			return r;



		vm->pasid = pasid;

	}





	return 0;

}



/**

 * amdgpu_vm_bo_evicted - vm_bo is evicted

 *
@@ -2554,6 +2512,7 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm) 
 * @adev: amdgpu_device pointer

 * @vm: requested vm

 * @xcp_id: GPU partition selection id

 * @pasid: the pasid the VM is using on this GPU

 *

 * Init @vm fields.

 *
@@ -2561,7 +2520,7 @@ void amdgpu_vm_set_task_info(struct amdgpu_vm *vm) 
 * 0 for success, error for failure.

 */

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

		   int32_t xcp_id)

		   int32_t xcp_id, uint32_t pasid)

{

	struct amdgpu_bo *root_bo;

	struct amdgpu_bo_vm *root;
@@ -2638,12 +2597,26 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	if (r)

		dev_dbg(adev->dev, "Failed to create task info for VM\n");



	/* Store new PASID in XArray (if non-zero) */

	if (pasid != 0) {

		r = xa_err(xa_store_irq(&adev->vm_manager.pasids, pasid, vm, GFP_KERNEL));

		if (r < 0)

			goto error_free_root;



		vm->pasid = pasid;

	}



	amdgpu_bo_unreserve(vm->root.bo);

	amdgpu_bo_unref(&root_bo);



	return 0;



error_free_root:

	/* If PASID was partially set, erase it from XArray before failing */

	if (vm->pasid != 0) {

		xa_erase_irq(&adev->vm_manager.pasids, vm->pasid);

		vm->pasid = 0;

	}

	amdgpu_vm_pt_free_root(adev, vm);

	amdgpu_bo_unreserve(vm->root.bo);

	amdgpu_bo_unref(&root_bo);
@@ -2749,7 +2722,11 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) 


	root = amdgpu_bo_ref(vm->root.bo);

	amdgpu_bo_reserve(root, true);

	amdgpu_vm_set_pasid(adev, vm, 0);

	/* Remove PASID mapping before destroying VM */

	if (vm->pasid != 0) {

		xa_erase_irq(&adev->vm_manager.pasids, vm->pasid);

		vm->pasid = 0;

	}

	dma_fence_wait(vm->last_unlocked, false);

	dma_fence_put(vm->last_unlocked);

	dma_fence_wait(vm->last_tlb_flush, false);

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

+1 −4
Original line number Diff line number Diff line
@@ -503,11 +503,8 @@ extern const struct amdgpu_vm_update_funcs amdgpu_vm_sdma_funcs; 
void amdgpu_vm_manager_init(struct amdgpu_device *adev);

void amdgpu_vm_manager_fini(struct amdgpu_device *adev);



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

			u32 pasid);



long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout);

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id);

int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, int32_t xcp_id, uint32_t pasid);

int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm);

void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm);

int amdgpu_vm_lock_pd(struct amdgpu_vm *vm, struct drm_exec *exec,