diff options
author | Christian König <christian.koenig@amd.com> | 2018-01-08 08:48:11 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:17:47 -0500 |
commit | 5a4633c4b880cf8d1fe7df9c55766205cf9bc295 (patch) | |
tree | 63421f601ff8d6584c1df7e5146a26b6649e67e7 /drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |
parent | ba35222437f457cdc50f3651b36701c9584e4af4 (diff) |
drm/amdgpu: forward pasid to backend flush implementations
rd the pasid from the VM code to the emit_vm_flush function and update
all implementations with the new parameter.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 659a8f2d9bf8..85a0ecaba3e3 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | |||
@@ -888,7 +888,8 @@ static void vcn_v1_0_dec_vm_reg_wait(struct amdgpu_ring *ring, | |||
888 | } | 888 | } |
889 | 889 | ||
890 | static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, | 890 | static void vcn_v1_0_dec_ring_emit_vm_flush(struct amdgpu_ring *ring, |
891 | unsigned vmid, uint64_t pd_addr) | 891 | unsigned vmid, unsigned pasid, |
892 | uint64_t pd_addr) | ||
892 | { | 893 | { |
893 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; | 894 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; |
894 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); | 895 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); |
@@ -1021,7 +1022,8 @@ static void vcn_v1_0_enc_ring_emit_ib(struct amdgpu_ring *ring, | |||
1021 | } | 1022 | } |
1022 | 1023 | ||
1023 | static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, | 1024 | static void vcn_v1_0_enc_ring_emit_vm_flush(struct amdgpu_ring *ring, |
1024 | unsigned int vmid, uint64_t pd_addr) | 1025 | unsigned int vmid, unsigned pasid, |
1026 | uint64_t pd_addr) | ||
1025 | { | 1027 | { |
1026 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; | 1028 | struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; |
1027 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); | 1029 | uint32_t req = ring->adev->gmc.gmc_funcs->get_invalidate_req(vmid); |