drm/amdgpu: separate PASID mapping from VM flush v2

Stuffing the PASID mapping into the VM flush isn't flexible enough since
the PASID mapping changes not as often as we need a VM flush.

v2: add missing use of gmc_v7_0_emit_pasid_mapping

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 0572d6072baa..afa16a862eaa 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -612,8 +612,11 @@ int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job, bool need_
                 struct dma_fence *fence;
 
                 trace_amdgpu_vm_flush(ring, job->vmid, job->vm_pd_addr);
-                amdgpu_ring_emit_vm_flush(ring, job->vmid, job->pasid,
-                                          job->vm_pd_addr);
+                amdgpu_ring_emit_vm_flush(ring, job->vmid, job->vm_pd_addr);
+                if (adev->gmc.gmc_funcs->emit_pasid_mapping &&
+                    ring->funcs->emit_wreg)
+                        amdgpu_gmc_emit_pasid_mapping(ring, job->vmid,
+                                                      job->pasid);
 
                 r = amdgpu_fence_emit(ring, &fence);
                 if (r)