From 94e69f4141fcad0ba26ab178399d6393473e6ca2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 19 Oct 2017 16:25:59 +0200 Subject: [PATCH] radv: move DB_COUNT_CONTROL initialization to si_emit_config() CLEAR_STATE will initialize DB_COUNT_CONTROL to 0 for CIK+. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_cmd_buffer.c | 1 - src/amd/vulkan/si_cmd_buffer.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index f4aa9e9b16f..8c5c75d3cb6 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2160,7 +2160,6 @@ VkResult radv_BeginCommandBuffer( switch (cmd_buffer->queue_family_index) { case RADV_QUEUE_GENERAL: emit_gfx_buffer_state(cmd_buffer); - radv_set_db_count_control(cmd_buffer); break; case RADV_QUEUE_COMPUTE: si_init_compute(cmd_buffer); diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 690f30b6abc..de3b3883fc8 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -528,6 +528,11 @@ si_emit_config(struct radv_physical_device *physical_device, radeon_emit(cs, S_028A04_MIN_SIZE(radv_pack_float_12p4(0)) | S_028A04_MAX_SIZE(radv_pack_float_12p4(8192/2))); + if (!physical_device->has_clear_state) { + radeon_set_context_reg(cs, R_028004_DB_COUNT_CONTROL, + S_028004_ZPASS_INCREMENT_DISABLE(1)); + } + si_emit_compute(physical_device, cs); } -- 2.30.2