From dd7e8d3cdb5c314f6ed3abf07be728d5ff3546cb Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 25 Nov 2022 12:00:33 +0100 Subject: [PATCH] radv: make sure to mark DCC as compressed on GFX11 The bit has moved to FDCC_ENABLE on GFX11. Found by inspection. Cc: 22.3 mesa-stable Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: (cherry picked from commit ccac91db7bbf3b428ad4138e0982c54636b4b96c) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 69cad66c3fa..902cf3e5bb4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1426,7 +1426,7 @@ "description": "radv: make sure to mark DCC as compressed on GFX11", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index ad405cdeb68..dd49f942b7a 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2190,7 +2190,9 @@ radv_emit_fb_color_state(struct radv_cmd_buffer *cmd_buffer, int index, } } - if (G_028C70_DCC_ENABLE(cb_color_info)) { + if (cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11 + ? G_028C78_FDCC_ENABLE(cb_fdcc_control) + : G_028C70_DCC_ENABLE(cb_color_info)) { /* Drawing with DCC enabled also compresses colorbuffers. */ VkImageSubresourceRange range = { .aspectMask = iview->vk.aspects,