Skip to content

Commit febc9c6

Browse files
peppsacalexdeucher
authored andcommitted
drm/amdgpu: use sdma_v6 single packet invalidation
This achieves the same result as the sequence used in emit_flush_gpu_tlb but the invalidation is now a single packet instead of the 3 packets required to implement reg_write_reg_wait. Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Monk Liu <monk.liu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent aee89b7 commit febc9c6

1 file changed

Lines changed: 22 additions & 1 deletion

File tree

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,28 @@ static void sdma_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
11731173
static void sdma_v6_0_ring_emit_vm_flush(struct amdgpu_ring *ring,
11741174
unsigned vmid, uint64_t pd_addr)
11751175
{
1176-
amdgpu_gmc_emit_flush_gpu_tlb(ring, vmid, pd_addr);
1176+
struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub];
1177+
uint32_t req = hub->vmhub_funcs->get_invalidate_req(vmid, 0);
1178+
1179+
/* Update the PD address for this VMID. */
1180+
amdgpu_ring_emit_wreg(ring, hub->ctx0_ptb_addr_lo32 +
1181+
(hub->ctx_addr_distance * vmid),
1182+
lower_32_bits(pd_addr));
1183+
amdgpu_ring_emit_wreg(ring, hub->ctx0_ptb_addr_hi32 +
1184+
(hub->ctx_addr_distance * vmid),
1185+
upper_32_bits(pd_addr));
1186+
1187+
/* Trigger invalidation. */
1188+
amdgpu_ring_write(ring,
1189+
SDMA_PKT_VM_INVALIDATION_HEADER_OP(SDMA_OP_POLL_REGMEM) |
1190+
SDMA_PKT_VM_INVALIDATION_HEADER_SUB_OP(SDMA_SUBOP_VM_INVALIDATION) |
1191+
SDMA_PKT_VM_INVALIDATION_HEADER_GFX_ENG_ID(ring->vm_inv_eng) |
1192+
SDMA_PKT_VM_INVALIDATION_HEADER_MM_ENG_ID(0x1f));
1193+
amdgpu_ring_write(ring, req);
1194+
amdgpu_ring_write(ring, 0xFFFFFFFF);
1195+
amdgpu_ring_write(ring,
1196+
SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_INVALIDATEACK(1 << vmid) |
1197+
SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_ADDRESSRANGEHI(0x1F));
11771198
}
11781199

11791200
static void sdma_v6_0_ring_emit_wreg(struct amdgpu_ring *ring,

0 commit comments

Comments
 (0)