From 9339ed2f85ff6f1985924acc4950857e8ed9bab9 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Thu, 17 Sep 2020 20:18:42 +0200
Subject: [PATCH] radv: Enable DCC in the GENERAL layout on GFX10+.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7004>
---
 src/amd/vulkan/radv_image.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 40d1869541d..fac2bb5343c 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1800,11 +1800,14 @@ bool radv_layout_dcc_compressed(const struct radv_device *device,
 			        unsigned queue_mask)
 {
 	/* Don't compress compute transfer dst, as image stores are not supported. */
-	if (layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL &&
+	if ((layout == VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL ||
+	     layout == VK_IMAGE_LAYOUT_GENERAL) &&
 	    (queue_mask & (1u << RADV_QUEUE_COMPUTE)))
 		return false;
 
-	return radv_image_has_dcc(image) && layout != VK_IMAGE_LAYOUT_GENERAL;
+	return radv_image_has_dcc(image) &&
+	       (device->physical_device->rad_info.chip_class >= GFX10 ||
+	        layout != VK_IMAGE_LAYOUT_GENERAL);
 }