drm/amdgpu/gfx: extract compute wptr doorbell helpers to amdgpu_gfx.c
Subsystems (2)
PATCH 1/1 drm/amdgpu/gfx: extract compute wptr doorbell helpers to amdgpu_gfx.c
Move the duplicated doorbell-based get_wptr/set_wptr functions from gfx_v9_0.c, gfx_v10_0.c, gfx_v11_0.c, and gfx_v12_0.c into common helpers amdgpu_gfx_get_wptr_compute() and amdgpu_gfx_set_wptr_compute() in amdgpu_gfx.c.
These functions are not HW generation dependent -- the doorbell path is identical across all four GFX versions:
get: atomic64_read(ring->wptr_cpu_addr)
set: atomic64_set(ring->wptr_cpu_addr) + WDOORBELL64()
The non-doorbell fallback is replaced with WARN_ON_ONCE instead of BUG() since doorbell is the only supported method on gfx9+ compute rings.
Not touched: gfx_v7_0, gfx_v8_0, gfx_v9_4_3 -- these have different wptr access patterns (MMIO registers or wb.wb[] offsets).
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 39 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 ++ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 33 +++------------------ drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 34 +++------------------ drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 34 +++------------------ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 39 +++---------------------- 6 files changed, 58 insertions(+), 124 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +39 -0
@@ -2596,3 +2596,42 @@ void amdgpu_debugfs_compute_sched_mask_init(struct amdgpu_device *adev)#endif } +/** +* amdgpu_gfx_get_wptr_compute - common get_wptr for compute rings using doorbells +* @ring: amdgpu_ring pointer +* +* Read the write pointer from the doorbell-mapped writeback address. +* This is HW-agnostic and shared across GFX generations that use +* doorbell-based compute queue management. +*/ +u64 amdgpu_gfx_get_wptr_compute (struct amdgpu_ring *ring) +{ +/* XXX check if swapping is necessary on BE */ +if (ring->use_doorbell) +return atomic64_read ((atomic64_t *)ring->wptr_cpu_addr); + +WARN_ON_ONCE (1 ); +return 0 ; +} + +/** +* amdgpu_gfx_set_wptr_compute - common set_wptr for compute rings using doorbells +* @ring: amdgpu_ring pointer +* +* Write the write pointer to the doorbell-mapped writeback address and +* ring the doorbell. This is HW-agnostic and shared across GFX +* generations that use doorbell-based compute queue management. +*/ +void amdgpu_gfx_set_wptr_compute (struct amdgpu_ring *ring) +{ +struct amdgpu_device *adev = ring->adev; + +/* XXX check if swapping is necessary on BE */ +if (ring->use_doorbell) { +atomic64_set ((atomic64_t *)ring->wptr_cpu_addr, ring->wptr); +WDOORBELL64 (ring->doorbell_index, ring->wptr); + }else { +WARN_ON_ONCE (1 ); + } +} +
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +3 -0
@@ -653,6 +653,9 @@ u32 amdgpu_gfx_csb_preamble_start(u32 *buffer);u32 amdgpu_gfx_csb_data_parser (struct amdgpu_device *adev,u32 *buffer,u32 count);void amdgpu_gfx_csb_preamble_end (u32 *buffer,u32 count); +u64 amdgpu_gfx_get_wptr_compute (struct amdgpu_ring *ring); +void amdgpu_gfx_set_wptr_compute (struct amdgpu_ring *ring); +void amdgpu_debugfs_gfx_sched_mask_init (struct amdgpu_device *adev);void amdgpu_debugfs_compute_sched_mask_init (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +4 -29
@@ -8586,31 +8586,6 @@ static u64 gfx_v10_0_ring_get_rptr_compute(struct amdgpu_ring *ring)return *(uint32_t *)ring->rptr_cpu_addr; } -static u64 gfx_v10_0_ring_get_wptr_compute (struct amdgpu_ring *ring) -{ -u64 wptr; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) - wptr =atomic64_read ((atomic64_t *)ring->wptr_cpu_addr); -else -BUG (); -return wptr; -} - -static void gfx_v10_0_ring_set_wptr_compute (struct amdgpu_ring *ring) -{ -struct amdgpu_device *adev = ring->adev; - -if (ring->use_doorbell) { -atomic64_set ((atomic64_t *)ring->wptr_cpu_addr, - ring->wptr); -WDOORBELL64 (ring->doorbell_index, ring->wptr); - }else { -BUG ();/* only DOORBELL method supported on gfx10 now */ - } -} -static void gfx_v10_0_ring_emit_hdp_flush (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -9881,8 +9856,8 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_compute = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v10_0_ring_get_rptr_compute, - .get_wptr = gfx_v10_0_ring_get_wptr_compute, - .set_wptr = gfx_v10_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =20 +/* gfx_v10_0_ring_emit_gds_switch */ 7 + /* gfx_v10_0_ring_emit_hdp_flush */
@@ -9921,8 +9896,8 @@ static const struct amdgpu_ring_funcs gfx_v10_0_ring_funcs_kiq = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v10_0_ring_get_rptr_compute, - .get_wptr = gfx_v10_0_ring_get_wptr_compute, - .set_wptr = gfx_v10_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =20 +/* gfx_v10_0_ring_emit_gds_switch */ 7 + /* gfx_v10_0_ring_emit_hdp_flush */
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +4 -30
@@ -5818,32 +5818,6 @@ static u64 gfx_v11_0_ring_get_rptr_compute(struct amdgpu_ring *ring)return *(uint32_t *)ring->rptr_cpu_addr; } -static u64 gfx_v11_0_ring_get_wptr_compute (struct amdgpu_ring *ring) -{ -u64 wptr; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) - wptr =atomic64_read ((atomic64_t *)ring->wptr_cpu_addr); -else -BUG (); -return wptr; -} - -static void gfx_v11_0_ring_set_wptr_compute (struct amdgpu_ring *ring) -{ -struct amdgpu_device *adev = ring->adev; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) { -atomic64_set ((atomic64_t *)ring->wptr_cpu_addr, - ring->wptr); -WDOORBELL64 (ring->doorbell_index, ring->wptr); - }else { -BUG ();/* only DOORBELL method supported on gfx11 now */ - } -} -static void gfx_v11_0_ring_emit_hdp_flush (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -7266,8 +7240,8 @@ static const struct amdgpu_ring_funcs gfx_v11_0_ring_funcs_compute = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v11_0_ring_get_rptr_compute, - .get_wptr = gfx_v11_0_ring_get_wptr_compute, - .set_wptr = gfx_v11_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =5 +/* update_spm_vmid */ 20 + /* gfx_v11_0_ring_emit_gds_switch */
@@ -7307,8 +7281,8 @@ static const struct amdgpu_ring_funcs gfx_v11_0_ring_funcs_kiq = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v11_0_ring_get_rptr_compute, - .get_wptr = gfx_v11_0_ring_get_wptr_compute, - .set_wptr = gfx_v11_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =20 +/* gfx_v11_0_ring_emit_gds_switch */ 7 + /* gfx_v11_0_ring_emit_hdp_flush */
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +4 -30
@@ -4363,32 +4363,6 @@ static u64 gfx_v12_0_ring_get_rptr_compute(struct amdgpu_ring *ring)return *(uint32_t *)ring->rptr_cpu_addr; } -static u64 gfx_v12_0_ring_get_wptr_compute (struct amdgpu_ring *ring) -{ -u64 wptr; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) - wptr =atomic64_read ((atomic64_t *)ring->wptr_cpu_addr); -else -BUG (); -return wptr; -} - -static void gfx_v12_0_ring_set_wptr_compute (struct amdgpu_ring *ring) -{ -struct amdgpu_device *adev = ring->adev; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) { -atomic64_set ((atomic64_t *)ring->wptr_cpu_addr, - ring->wptr); -WDOORBELL64 (ring->doorbell_index, ring->wptr); - }else { -BUG ();/* only DOORBELL method supported on gfx12 now */ - } -} -static void gfx_v12_0_ring_emit_hdp_flush (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev;
@@ -5523,8 +5497,8 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_compute = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v12_0_ring_get_rptr_compute, - .get_wptr = gfx_v12_0_ring_get_wptr_compute, - .set_wptr = gfx_v12_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =7 +/* gfx_v12_0_ring_emit_hdp_flush */ 5 + /* hdp invalidate */
@@ -5561,8 +5535,8 @@ static const struct amdgpu_ring_funcs gfx_v12_0_ring_funcs_kiq = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v12_0_ring_get_rptr_compute, - .get_wptr = gfx_v12_0_ring_get_wptr_compute, - .set_wptr = gfx_v12_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =7 +/* gfx_v12_0_ring_emit_hdp_flush */ 5 + /*hdp invalidate */
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +4 -35
@@ -5640,37 +5640,6 @@ static u64 gfx_v9_0_ring_get_rptr_compute(struct amdgpu_ring *ring)return *ring->rptr_cpu_addr;/* gfx9 hardware is 32bit rptr */ } -static u64 gfx_v9_0_ring_get_wptr_compute (struct amdgpu_ring *ring) -{ -u64 wptr; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) { - wptr =atomic64_read ((atomic64_t *)ring->wptr_cpu_addr); - }else { -WARN_ONCE (1 ,"gfx_v9_0: non-doorbell wptr read on ring %s, " -"only doorbell method supported on gfx9\n" , - ring->name); - wptr =0 ; - } -return wptr; -} - -static void gfx_v9_0_ring_set_wptr_compute (struct amdgpu_ring *ring) -{ -struct amdgpu_device *adev = ring->adev; - -/* XXX check if swapping is necessary on BE */ -if (ring->use_doorbell) { -atomic64_set ((atomic64_t *)ring->wptr_cpu_addr, ring->wptr); -WDOORBELL64 (ring->doorbell_index, ring->wptr); - }else { -WARN_ONCE (1 ,"gfx_v9_0: non-doorbell wptr write on ring %s, " -"only doorbell method supported on gfx9\n" , - ring->name); - } -} -static void gfx_v9_0_ring_emit_fence_kiq (struct amdgpu_ring *ring,u64 addr,u64 seq,unsigned int flags) {
@@ -7627,8 +7596,8 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_compute = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v9_0_ring_get_rptr_compute, - .get_wptr = gfx_v9_0_ring_get_wptr_compute, - .set_wptr = gfx_v9_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =20 +/* gfx_v9_0_ring_emit_gds_switch */ 7 + /* gfx_v9_0_ring_emit_hdp_flush */
@@ -7669,8 +7638,8 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = { .nop = PACKET3(PACKET3_NOP, 0x3FFF), .support_64bit_ptrs = true, .get_rptr = gfx_v9_0_ring_get_rptr_compute, - .get_wptr = gfx_v9_0_ring_get_wptr_compute, - .set_wptr = gfx_v9_0_ring_set_wptr_compute, + .get_wptr = amdgpu_gfx_get_wptr_compute, + .set_wptr = amdgpu_gfx_set_wptr_compute, .emit_frame_size =20 +/* gfx_v9_0_ring_emit_gds_switch */ 7 + /* gfx_v9_0_ring_emit_hdp_flush */
Signature · 1 line
2.43.0