From 14483d16b52b18315d2fb1fef2d5f65afeaf7582 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 30 Jan 2023 02:31:41 +0100 Subject: [PATCH] radv: Set FDCC_CONTROL SAMPLE_MASK_TRACKER_WATERMARK Might cause hangs according to comments. Syncs with radeonsi/PAL. Fixes: e210ffb4d0d ("radv: update framebuffer registers on GFX11") Part-of: (cherry picked from commit d321bc1323b02de92a095397830c9296996e16b3) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 076edfe7add..98921605ded 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4297,7 +4297,7 @@ "description": "radv: Set FDCC_CONTROL SAMPLE_MASK_TRACKER_WATERMARK", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e210ffb4d0dc6b91fad79134a9712a5d5694f2f8" }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 7eba6bd20f8..538b3cdb771 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2946,7 +2946,7 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11) { radeon_set_context_reg(cmd_buffer->cs, R_028424_CB_FDCC_CONTROL, - S_028424_SAMPLE_MASK_TRACKER_WATERMARK(15)); + S_028424_SAMPLE_MASK_TRACKER_WATERMARK(0)); } else { uint8_t watermark = gfx_level >= GFX10 ? 6 : 4;