diff --git a/src/amd/vulkan/radv_cs.h b/src/amd/vulkan/radv_cs.h index 0ff7a703581..697250b54ec 100644 --- a/src/amd/vulkan/radv_cs.h +++ b/src/amd/vulkan/radv_cs.h @@ -290,4 +290,10 @@ void radv_emit_cond_exec(const struct radv_device *device, struct radeon_cmdbuf void radv_cs_write_data_imm(struct radeon_cmdbuf *cs, unsigned engine_sel, uint64_t va, uint32_t imm); +static inline void +radv_emit_pm4_commands(struct radeon_cmdbuf *cs, const struct ac_pm4_state *pm4) +{ + radeon_emit_array(cs, pm4->pm4, pm4->ndw); +} + #endif /* RADV_CS_H */ diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index 7b66633b510..d5123799bea 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -716,9 +716,7 @@ radv_emit_compute(struct radv_device *device, struct radeon_cmdbuf *cs, bool is_ S_00B8BC_INTERLEAVE_1D(preamble_state.gfx11.compute_dispatch_interleave)); ac_pm4_finalize(pm4); - - radeon_emit_array(cs, pm4->pm4, pm4->ndw); - + radv_emit_pm4_commands(cs, pm4); ac_pm4_free_state(pm4); } @@ -889,7 +887,7 @@ radv_emit_graphics(struct radv_device *device, struct radeon_cmdbuf *cs) } ac_pm4_finalize(pm4); - radeon_emit_array(cs, pm4->pm4, pm4->ndw); + radv_emit_pm4_commands(cs, pm4); ac_pm4_free_state(pm4); radv_emit_compute(device, cs, false); diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c index 8f13f239e3f..5a37d73307f 100644 --- a/src/amd/vulkan/radv_sqtt.c +++ b/src/amd/vulkan/radv_sqtt.c @@ -76,7 +76,7 @@ radv_emit_sqtt_start(const struct radv_device *device, struct radeon_cmdbuf *cs, ac_pm4_finalize(pm4); radeon_check_space(device->ws, cs, pm4->ndw); - radeon_emit_array(cs, pm4->pm4, pm4->ndw); + radv_emit_pm4_commands(cs, pm4); ac_pm4_free_state(pm4); } @@ -96,7 +96,7 @@ radv_emit_sqtt_stop(const struct radv_device *device, struct radeon_cmdbuf *cs, ac_pm4_finalize(pm4); radeon_check_space(device->ws, cs, pm4->ndw); - radeon_emit_array(cs, pm4->pm4, pm4->ndw); + radv_emit_pm4_commands(cs, pm4); ac_pm4_clear_state(pm4, &pdev->info, false, is_compute_queue); @@ -109,7 +109,7 @@ radv_emit_sqtt_stop(const struct radv_device *device, struct radeon_cmdbuf *cs, ac_pm4_finalize(pm4); radeon_check_space(device->ws, cs, pm4->ndw); - radeon_emit_array(cs, pm4->pm4, pm4->ndw); + radv_emit_pm4_commands(cs, pm4); ac_pm4_free_state(pm4); }