From 427fd83d27f1d4b0aa38226302004100d5f21706 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 1 Mar 2023 10:57:53 +0100 Subject: [PATCH] radv: use new EVENT_WRITE_ZPASS packet3 on GFX11 Ported from RadeonSI. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_query.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index c402519..e68a6fc 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1799,14 +1799,17 @@ emit_begin_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *poo radeon_emit(cs, PIXEL_PIPE_STATE_CNTL_INSTANCE_EN_HI(rb_mask)); } - radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0)); - - if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11) { - radeon_emit(cs, EVENT_TYPE(V_028A90_PIXEL_PIPE_STAT_DUMP) | EVENT_INDEX(1)); + if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11 && + cmd_buffer->device->physical_device->rad_info.pfp_fw_version >= EVENT_WRITE_ZPASS_PFP_VERSION) { + radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_ZPASS, 1, 0)); } else { - radeon_emit(cs, EVENT_TYPE(V_028A90_ZPASS_DONE) | EVENT_INDEX(1)); + radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0)); + if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11) { + radeon_emit(cs, EVENT_TYPE(V_028A90_PIXEL_PIPE_STAT_DUMP) | EVENT_INDEX(1)); + } else { + radeon_emit(cs, EVENT_TYPE(V_028A90_ZPASS_DONE) | EVENT_INDEX(1)); + } } - radeon_emit(cs, va); radeon_emit(cs, va >> 32); break; @@ -1931,11 +1934,16 @@ emit_end_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *pool, cmd_buffer->state.perfect_occlusion_queries_enabled = false; } - radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0)); - if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11) { - radeon_emit(cs, EVENT_TYPE(V_028A90_PIXEL_PIPE_STAT_DUMP) | EVENT_INDEX(1)); + if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11 && + cmd_buffer->device->physical_device->rad_info.pfp_fw_version >= EVENT_WRITE_ZPASS_PFP_VERSION) { + radeon_emit(cs, PKT3(PKT3_EVENT_WRITE_ZPASS, 1, 0)); } else { - radeon_emit(cs, EVENT_TYPE(V_028A90_ZPASS_DONE) | EVENT_INDEX(1)); + radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 2, 0)); + if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11) { + radeon_emit(cs, EVENT_TYPE(V_028A90_PIXEL_PIPE_STAT_DUMP) | EVENT_INDEX(1)); + } else { + radeon_emit(cs, EVENT_TYPE(V_028A90_ZPASS_DONE) | EVENT_INDEX(1)); + } } radeon_emit(cs, va + 8); radeon_emit(cs, (va + 8) >> 32); -- 2.7.4