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

drm/amdgpu: allow direct submission of PDE updates v2 



For handling PDE updates directly in the fault handler.

v2: fix typo in comment

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

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

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int vm_update_pds(struct amdgpu_vm *vm, struct amdgpu_sync *sync) 
	struct amdgpu_device *adev = amdgpu_ttm_adev(pd->tbo.bdev);

	int ret;



	ret = amdgpu_vm_update_directories(adev, vm);

	ret = amdgpu_vm_update_pdes(adev, vm, false);

	if (ret)

		return ret;

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

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

		return r;



	r = amdgpu_vm_update_directories(adev, vm);

	r = amdgpu_vm_update_pdes(adev, vm, false);

	if (r)

		return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
			goto error;

	}



	r = amdgpu_vm_update_directories(adev, vm);

	r = amdgpu_vm_update_pdes(adev, vm, false);



error:

	if (r && r != -ERESTARTSYS)

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

+5 −3
Original line number Diff line number Diff line
@@ -1227,18 +1227,19 @@ static void amdgpu_vm_invalidate_pds(struct amdgpu_device *adev, 
}



/*

 * amdgpu_vm_update_directories - make sure that all directories are valid

 * amdgpu_vm_update_pdes - make sure that all directories are valid

 *

 * @adev: amdgpu_device pointer

 * @vm: requested vm

 * @direct: submit directly to the paging queue

 *

 * Makes sure all directories are up to date.

 *

 * Returns:

 * 0 for success, error for failure.

 */

int amdgpu_vm_update_directories(struct amdgpu_device *adev,

				 struct amdgpu_vm *vm)

int amdgpu_vm_update_pdes(struct amdgpu_device *adev,

			  struct amdgpu_vm *vm, bool direct)

{

	struct amdgpu_vm_update_params params;

	int r;
@@ -1249,6 +1250,7 @@ int amdgpu_vm_update_directories(struct amdgpu_device *adev, 
	memset(&params, 0, sizeof(params));

	params.adev = adev;

	params.vm = vm;

	params.direct = direct;



	r = vm->update_funcs->prepare(&params, AMDGPU_FENCE_OWNER_VM, NULL);

	if (r)

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

+2 −2
Original line number Diff line number Diff line
@@ -366,8 +366,8 @@ int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
			      int (*callback)(void *p, struct amdgpu_bo *bo),

			      void *param);

int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_pipe_sync);

int amdgpu_vm_update_directories(struct amdgpu_device *adev,

				 struct amdgpu_vm *vm);

int amdgpu_vm_update_pdes(struct amdgpu_device *adev,

			  struct amdgpu_vm *vm, bool direct);

int amdgpu_vm_clear_freed(struct amdgpu_device *adev,

			  struct amdgpu_vm *vm,

			  struct dma_fence **fence);

CRA Git | Maintained and supported by SUSTech CRA and CCSE