From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 30 Nov 2017 01:16:29 +0000 (+0100)
Subject: radeonsi/gfx9: fix importing shared textures with DCC
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed4780383cae61e051b3d3d120649222da49feae;p=mesa.git

radeonsi/gfx9: fix importing shared textures with DCC

VI has 11 dwords at least. GFX9 has 10 dwords.

Cc: 17.2 17.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 1a0503bec6e..86a2e1b9a5e 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -646,7 +646,7 @@ static void si_apply_opaque_metadata(struct si_screen *sscreen,
 	/* Return if DCC is enabled. The texture should be set up with it
 	 * already.
 	 */
-	if (md->size_metadata >= 11 * 4 &&
+	if (md->size_metadata >= 10 * 4 && /* at least 2(header) + 8(desc) dwords */
 	    md->metadata[0] != 0 &&
 	    md->metadata[1] == si_get_bo_metadata_word1(sscreen) &&
 	    G_008F28_COMPRESSION_EN(desc[6])) {