From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 30 Jan 2020 21:59:39 +0000 (-0500)
Subject: radeonsi: don't update states for the DCC MSAA bug on GFX6-7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1082e6fcb87d723986b640b5c077d05692df3511;p=mesa.git

radeonsi: don't update states for the DCC MSAA bug on GFX6-7

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3646>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3646>
---

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index e3e0ffa64e1..34b903c6fc0 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -618,7 +618,7 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx,
 
 		blend->blend_enable_4bit |= 0xfu << (i * 4);
 
-		if (sctx->family <= CHIP_NAVI14)
+		if (sctx->chip_class >= GFX8 && sctx->family <= CHIP_NAVI14)
 			blend->dcc_msaa_corruption_4bit |= 0xfu << (i * 4);
 
 		/* This is only important for formats without alpha. */
@@ -631,7 +631,7 @@ static void *si_create_blend_state_mode(struct pipe_context *ctx,
 			blend->need_src_alpha_4bit |= 0xfu << (i * 4);
 	}
 
-	if (sctx->family <= CHIP_NAVI14 && logicop_enable)
+	if (sctx->chip_class >= GFX8 && sctx->family <= CHIP_NAVI14 && logicop_enable)
 		blend->dcc_msaa_corruption_4bit |= blend->cb_target_enabled_4bit;
 
 	if (blend->cb_target_mask) {