From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sun, 19 Nov 2017 16:26:23 +0000 (+0100)
Subject: amd/common/gfx10: CMASK is only used for FMASK
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70fd27d1e318e67ab5efffe505f6f357b061e070;p=mesa.git

amd/common/gfx10: CMASK is only used for FMASK

All regular color compression is done via DCC.

Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 73fdc55408f..298dfe20838 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1339,8 +1339,9 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 			}
 		}
 
-		/* CMASK */
-		if (in->swizzleMode != ADDR_SW_LINEAR) {
+		/* CMASK -- on GFX10 only for FMASK */
+		if (in->swizzleMode != ADDR_SW_LINEAR &&
+		    (info->chip_class <= GFX9 || in->numSamples > 1)) {
 			ADDR2_COMPUTE_CMASK_INFO_INPUT cin = {0};
 			ADDR2_COMPUTE_CMASK_INFO_OUTPUT cout = {0};