Mesa (staging/19.3): radeonsi: fix the DCC MSAA bug workaround

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: 007013c754ac1b0b98e5950b0bc6aaa3d330c3ff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=007013c754ac1b0b98e5950b0bc6aaa3d330c3ff

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Jan 30 16:58:15 2020 -0500

radeonsi: fix the DCC MSAA bug workaround

Cc: 19.3 20.0 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3646>
(cherry picked from commit fbb27eebc8cab1a5d70ea67a37de8d18f20a88f0)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/radeonsi/si_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 95ebc79221d..c45df7b02a6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -355,7 +355,7 @@
         "description": "radeonsi: fix the DCC MSAA bug workaround",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 783ede89d0d..311453dae0a 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -685,7 +685,7 @@ static void si_bind_blend_state(struct pipe_context *ctx, void *state)
 
 	if (old_blend->cb_target_mask != blend->cb_target_mask ||
 	    old_blend->dual_src_blend != blend->dual_src_blend ||
-	    (old_blend->blend_enable_4bit != blend->blend_enable_4bit &&
+	    (old_blend->dcc_msaa_corruption_4bit != blend->dcc_msaa_corruption_4bit &&
 	     sctx->framebuffer.nr_samples >= 2 &&
 	     sctx->screen->dcc_msaa_allowed))
 		si_mark_atom_dirty(sctx, &sctx->atoms.s.cb_render_state);