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

drm/amdgpu: stop reserving VMIDs to enforce isolation 



That was quite troublesome for gang submit. Completely drop this
approach and enforce the isolation separately.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7fbcd77

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

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
			struct drm_gpu_scheduler *sched = entity->rq->sched;

			struct amdgpu_ring *ring = to_amdgpu_ring(sched);



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

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

				return -EINVAL;

		}

	}

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

+1 −8
Original line number Diff line number Diff line
@@ -1665,15 +1665,8 @@ static ssize_t amdgpu_gfx_set_enforce_isolation(struct device *dev, 
	}



	mutex_lock(&adev->enforce_isolation_mutex);

	for (i = 0; i < num_partitions; i++) {

		if (adev->enforce_isolation[i] && !partition_values[i])

			/* Going from enabled to disabled */

			amdgpu_vmid_free_reserved(adev, AMDGPU_GFXHUB(i));

		else if (!adev->enforce_isolation[i] && partition_values[i])

			/* Going from disabled to enabled */

			amdgpu_vmid_alloc_reserved(adev, AMDGPU_GFXHUB(i));

	for (i = 0; i < num_partitions; i++)

		adev->enforce_isolation[i] = partition_values[i];

	}

	mutex_unlock(&adev->enforce_isolation_mutex);



	amdgpu_mes_update_enforce_isolation(adev);

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

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

		goto error;



	if (amdgpu_vmid_uses_reserved(adev, vm, vmhub)) {

	if (amdgpu_vmid_uses_reserved(vm, vmhub)) {

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

		if (r || !id)

			goto error;
@@ -464,19 +464,14 @@ int amdgpu_vmid_grab(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 


/*

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

 * @adev: amdgpu_device pointer

 * @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_device *adev,

			       struct amdgpu_vm *vm, unsigned int vmhub)

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

{

	return vm->reserved_vmid[vmhub] ||

		(adev->enforce_isolation[(vm->root.bo->xcp_id != AMDGPU_XCP_NO_PARTITION) ?

					 vm->root.bo->xcp_id : 0] &&

		 AMDGPU_IS_GFXHUB(vmhub));

	return vm->reserved_vmid[vmhub];

}



int amdgpu_vmid_alloc_reserved(struct amdgpu_device *adev,

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

+1 −2
Original line number Diff line number Diff line
@@ -78,8 +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_device *adev,

			       struct amdgpu_vm *vm, unsigned int vmhub);

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,