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

drm/amdgpu: reject gang submit on reserved VMIDs 



A gang submit won't work if the VMID is reserved and we can't flush out
VM changes from multiple engines at the same time.

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>
(cherry picked from commit 320debca)
parent 256abd8e

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

+15 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,21 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	unsigned int i;

	int r;



	/*

	 * We can't use gang submit on with reserved VMIDs when the VM changes

	 * can't be invalidated by more than one engine at the same time.

	 */

	if (p->gang_size > 1 && !p->adev->vm_manager.concurrent_flush) {

		for (i = 0; i < p->gang_size; ++i) {

			struct drm_sched_entity *entity = p->entities[i];

			struct drm_gpu_scheduler *sched = entity->rq->sched;

			struct amdgpu_ring *ring = to_amdgpu_ring(sched);



			if (amdgpu_vmid_uses_reserved(vm, ring->vm_hub))

				return -EINVAL;

		}

	}



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		return r;

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

+14 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
	if (r || !idle)

		goto error;



	if (vm->reserved_vmid[vmhub] || (enforce_isolation && (vmhub == AMDGPU_GFXHUB(0)))) {

	if (amdgpu_vmid_uses_reserved(vm, vmhub)) {

		r = amdgpu_vmid_grab_reserved(vm, ring, job, &id, fence);

		if (r || !id)

			goto error;
@@ -456,6 +456,19 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
	return r;

}



/*

 * amdgpu_vmid_uses_reserved - check if a VM will use a reserved VMID

 * @vm: the VM to check

 * @vmhub: the VMHUB which will be used

 *

 * Returns: True if the VM will use a reserved VMID.

 */

bool amdgpu_vmid_uses_reserved(struct amdgpu_vm *vm, unsigned int vmhub)

{

	return vm->reserved_vmid[vmhub] ||

		(enforce_isolation && (vmhub == AMDGPU_GFXHUB(0)));

}



int amdgpu_vmid_alloc_reserved(struct amdgpu_device *adev,

			       unsigned vmhub)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv, 


bool amdgpu_vmid_had_gpu_reset(struct amdgpu_device *adev,

			       struct amdgpu_vmid *id);

bool amdgpu_vmid_uses_reserved(struct amdgpu_vm *vm, unsigned int vmhub);

int amdgpu_vmid_alloc_reserved(struct amdgpu_device *adev,

				unsigned vmhub);

void amdgpu_vmid_free_reserved(struct amdgpu_device *adev,