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

drm/amdgpu: cleanup SPM support a bit 



This should probably not access job->vm and also emit the SPM switch
under the conditional execute.

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>
parent 56b0989e

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

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static int amdgpu_vmid_grab_reserved(struct amdgpu_vm *vm, 
		return r;



	job->vm_needs_flush = needs_flush;

	job->spm_update_needed = true;

	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct amdgpu_job { 
	uint32_t                preemption_status;

	bool                    vm_needs_flush;

	bool			gds_switch_needed;

	bool			spm_update_needed;

	uint64_t		vm_pd_addr;

	unsigned		vmid;

	unsigned		pasid;

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

+5 −4
Original line number Diff line number Diff line
@@ -519,22 +519,20 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, 
	unsigned vmhub = ring->funcs->vmhub;

	struct amdgpu_vmid_mgr *id_mgr = &adev->vm_manager.id_mgr[vmhub];

	struct amdgpu_vmid *id = &id_mgr->ids[job->vmid];

	bool spm_update_needed = job->spm_update_needed;

	bool gds_switch_needed = ring->funcs->emit_gds_switch &&

		job->gds_switch_needed;

	bool vm_flush_needed = job->vm_needs_flush;

	struct dma_fence *fence = NULL;

	bool pasid_mapping_needed = false;

	unsigned patch_offset = 0;

	bool update_spm_vmid_needed = (job->vm && (job->vm->reserved_vmid[vmhub] != NULL));

	int r;



	if (update_spm_vmid_needed && adev->gfx.rlc.funcs->update_spm_vmid)

		adev->gfx.rlc.funcs->update_spm_vmid(adev, job->vmid);



	if (amdgpu_vmid_had_gpu_reset(adev, id)) {

		gds_switch_needed = true;

		vm_flush_needed = true;

		pasid_mapping_needed = true;

		spm_update_needed = true;

	}



	mutex_lock(&id_mgr->lock);
@@ -567,6 +565,9 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, 
	if (pasid_mapping_needed)

		amdgpu_gmc_emit_pasid_mapping(ring, job->vmid, job->pasid);



	if (spm_update_needed && adev->gfx.rlc.funcs->update_spm_vmid)

		adev->gfx.rlc.funcs->update_spm_vmid(adev, job->vmid);



	if (!ring->is_mes_queue && ring->funcs->emit_gds_switch &&

	    gds_switch_needed) {

		amdgpu_ring_emit_gds_switch(ring, job->vmid, job->gds_base,