drm/amdgpu: use sdma_v6 single packet invalidation
Subsystems (2)
PATCH 1/1 drm/amdgpu: use sdma_v6 single packet invalidation
From: Pierre-Eric Pelloux-Prayer <[email protected]>
Send this patch on behalf of Pierre-Eric.
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.
--- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +22 -1
@@ -1175,7 +1175,28 @@ static void sdma_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)static void sdma_v6_0_ring_emit_vm_flush (struct amdgpu_ring *ring,unsigned vmid,uint64_t pd_addr) { -amdgpu_gmc_emit_flush_gpu_tlb (ring, vmid, pd_addr); +struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; +uint32_t req = hub->vmhub_funcs->get_invalidate_req (vmid,0 ); + +/* Update the PD address for this VMID. */ +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + + (hub->ctx_addr_distance * vmid), +lower_32_bits (pd_addr)); +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_hi32 + + (hub->ctx_addr_distance * vmid), +upper_32_bits (pd_addr)); + +/* Trigger invalidation. */ +amdgpu_ring_write (ring, +SDMA_PKT_VM_INVALIDATION_HEADER_OP (SDMA_OP_POLL_REGMEM ) | +SDMA_PKT_VM_INVALIDATION_HEADER_SUB_OP (SDMA_SUBOP_VM_INVALIDATION ) | +SDMA_PKT_VM_INVALIDATION_HEADER_GFX_ENG_ID (ring->vm_inv_eng) | +SDMA_PKT_VM_INVALIDATION_HEADER_MM_ENG_ID (0x1f )); +amdgpu_ring_write (ring, req); +amdgpu_ring_write (ring,0xFFFFFFFF ); +amdgpu_ring_write (ring, +SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_INVALIDATEACK (1 << vmid) | +SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_ADDRESSRANGEHI (0x1F )); } static void sdma_v6_0_ring_emit_wreg(struct amdgpu_ring *ring,
Signature · 1 line
2.40.0
[AMD Official Use Only - General]
Hi guys, please chime in if with questions or concerns, this patch looks good to me.
Thanks
-------------------------------------------------------------------
Monk Liu | Cloud GPU & Virtualization Software | AMD
-------------------------------------------------------------------
-----Original Message-----
From: YuBiao Wang <[email protected]>
Sent: 2023年4月11日 15:17
To: [email protected]
Cc: Quan, Evan <[email protected]>; Chen, Horace <[email protected]>; Tuikov, Luben <[email protected]>; Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Liu, Monk <[email protected]>; Xu, Feifei <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Pelloux-Prayer, Pierre-Eric <[email protected]>
Subject: [PATCH] drm/amdgpu: use sdma_v6 single packet invalidation
From: Pierre-Eric Pelloux-Prayer <[email protected]>
Send this patch on behalf of Pierre-Eric.
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.
--- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +22 -2
@@ -1175,7 +1175,28 @@ static void sdma_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring) static void sdma_v6_0_ring_emit_vm_flush(struct amdgpu_ring *ring, unsigned vmid, uint64_t pd_addr) { -amdgpu_gmc_emit_flush_gpu_tlb (ring ,vmid ,pd_addr ); +struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs->vmhub]; +uint32_t req = hub->vmhub_funcs->get_invalidate_req (vmid,0 ); + +/* Update the PD address for this VMID. */ +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + + (hub->ctx_addr_distance * vmid), +lower_32_bits (pd_addr)); +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_hi32 + + (hub->ctx_addr_distance * vmid), +upper_32_bits (pd_addr)); + +/* Trigger invalidation. */ +amdgpu_ring_write (ring, +SDMA_PKT_VM_INVALIDATION_HEADER_OP (SDMA_OP_POLL_REGMEM ) | +SDMA_PKT_VM_INVALIDATION_HEADER_SUB_OP (SDMA_SUBOP_VM_INVALIDATION ) | +SDMA_PKT_VM_INVALIDATION_HEADER_GFX_ENG_ID (ring->vm_inv_eng) | +SDMA_PKT_VM_INVALIDATION_HEADER_MM_ENG_ID (0x1f )); +amdgpu_ring_write (ring, req); +amdgpu_ring_write (ring,0xFFFFFFFF ); +amdgpu_ring_write (ring, +SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_INVALIDATEACK (1 << vmid) | +SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_ADDRESSRANGEHI (0x1F )); } static void sdma_v6_0_ring_emit_wreg(struct amdgpu_ring *ring, --
2.40.0
[Public]
Quoted 15 lines
-----Original Message-----
From: YuBiao Wang <[email protected]>
Sent: Tuesday, April 11, 2023 3:17 AM
To: [email protected]
Cc: Quan, Evan <[email protected]>; Chen, Horace <[email protected]>; Tuikov, Luben <[email protected]>; Koenig, Christian <[email protected]>; Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Liu, Monk <[email protected]>; Xu, Feifei <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Pelloux-Prayer, Pierre-Eric <[email protected]>
Subject: [PATCH] drm/amdgpu: usesdma_v6single packet invalidationFrom: Pierre-Eric Pelloux-Prayer <[email protected]>
Quoted 8 lines
Send this patch on behalf of Pierre-Eric.
This achieves the same result as the sequence used in
emit_flush_gpu_tlbbut the invalidation is now a single packet instead of the 3 packets required to implementreg_write_reg_wait.Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux- [email protected]>
Quoted 54 lines
--- drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +0
-0@@ -1175,7 +1175,28 @@ static void
sdma_v6_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)static void sdma_v6_0_ring_emit_vm_flush(structamdgpu_ring*ring,drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +1
-1unsigned vmid, uint64_t pd_addr) { -amdgpu_gmc_emit_flush_gpu_tlb (ring ,vmid ,pd_addr ); + struct amdgpu_vmhub *hub = &ring->adev->vmhub[ring->funcs-Quoted 1 line
vmhub];
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +13
-0+uint32_t req = hub->vmhub_funcs->get_invalidate_req (vmid,0 ); + +/* Update the PD address for this VMID. */ +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_lo32 + + (hub->ctx_addr_distance * vmid), +lower_32_bits (pd_addr)); +amdgpu_ring_emit_wreg (ring, hub->ctx0_ptb_addr_hi32 + + (hub->ctx_addr_distance * vmid), +upper_32_bits (pd_addr)); + +/* Trigger invalidation. */ + amdgpu_ring_write(ring, +
SDMA_PKT_VM_INVALIDATION_HEADER_OP(SDMA_OP_POLL_REGMEM)| +SDMA_PKT_VM_INVALIDATION_HEADER_SUB_OP(SDMA_SUBOP_VM_INV ALIDATION)|
+SDMA_PKT_VM_INVALIDATION_HEADER_GFX_ENG_ID(ring->vm_inv_eng)|
+SDMA_PKT_VM_INVALIDATION_HEADER_MM_ENG_ID(0x1f));drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +4
-0+amdgpu_ring_write (ring, req); +amdgpu_ring_write (ring,0xFFFFFFFF ); + amdgpu_ring_write(ring, +
SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_INVALIDATEACK(1 << vmid)|
+SDMA_PKT_VM_INVALIDATION_ADDRESSRANGEHI_ADDRESSRANGEHI(0x1 F));
}static void sdma_v6_0_ring_emit_wreg(struct
amdgpu_ring*ring,
--
2.40.0