Mesa (main): radeonsi: add back a workaround for DCC MSAA on gfx9 due to conformance issues

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 86a33569f4ae8b818c86274044f7f01f2e5c4c8d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=86a33569f4ae8b818c86274044f7f01f2e5c4c8d

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Thu Oct  7 17:21:28 2021 -0400

radeonsi: add back a workaround for DCC MSAA on gfx9 due to conformance issues

Fixes: 8b95f51ef1 - radeonsi: fix and enable full DCC with MSAA 2x on gfx9

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13256>

---

 src/gallium/drivers/radeonsi/ci/raven-deqp-fail.csv | 5 -----
 src/gallium/drivers/radeonsi/si_texture.c           | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/ci/raven-deqp-fail.csv b/src/gallium/drivers/radeonsi/ci/raven-deqp-fail.csv
index 8c9a7b7e76f..e69de29bb2d 100644
--- a/src/gallium/drivers/radeonsi/ci/raven-deqp-fail.csv
+++ b/src/gallium/drivers/radeonsi/ci/raven-deqp-fail.csv
@@ -1,5 +0,0 @@
-dEQP-GLES3.functional.fbo.msaa.2_samples.r16f,Fail
-dEQP-GLES3.functional.fbo.msaa.2_samples.rg8,Fail
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb565,Fail
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb5_a1,Fail
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgba4,Fail
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 054d5056d0e..5205c719028 100644
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -232,6 +232,13 @@ static int si_init_surface(struct si_screen *sscreen, struct radeon_surf *surfac
          break;
 
       case GFX9:
+         /* DCC MSAA fails this on Raven:
+          *    https://www.khronos.org/registry/webgl/sdk/tests/deqp/functional/gles3/fbomultisample.2_samples.html
+          * and this on Picasso:
+          *    https://www.khronos.org/registry/webgl/sdk/tests/deqp/functional/gles3/fbomultisample.4_samples.html
+          */
+         if (sscreen->info.family == CHIP_RAVEN && ptex->nr_storage_samples >= 2 && bpe < 4)
+            flags |= RADEON_SURF_DISABLE_DCC;
          break;
 
       case GFX10: