radeonsi: add debug flags that disable DCC and DCC fast clear

For debugging, bug reports, etc.
This is not in the radeonsi directory, but it is about radeonsi.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 4ce0c6a1994239c701d6d59ec6a62fa9ecd4e3b9..0ad36849645039f550790505e9d77f66eb231713 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -360,6 +360,8 @@ static const struct debug_named_value common_debug_options[] = {
        { "precompile", DBG_PRECOMPILE, "Compile one shader variant at shader creation." },
        { "nowc", DBG_NO_WC, "Disable GTT write combining" },
        { "check_vm", DBG_CHECK_VM, "Check VM faults and dump debug info." },
+       { "nodcc", DBG_NO_DCC, "Disable DCC." },
+       { "nodccclear", DBG_NO_DCC_CLEAR, "Disable DCC fast clear." },
 
        DEBUG_NAMED_VALUE_END /* must be last */
 };

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index f21a0b3a1888b94d6591714f03bdbf5de8846fd9..c300c0b3332da721b311ca3b043cabe988139016 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -99,6 +99,8 @@
 #define DBG_INFO               (1llu << 40)
 #define DBG_NO_WC              (1llu << 41)
 #define DBG_CHECK_VM           (1llu << 42)
+#define DBG_NO_DCC             (1llu << 43)
+#define DBG_NO_DCC_CLEAR       (1llu << 44)
 
 #define R600_MAP_BUFFER_ALIGNMENT 64
 

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 40075ae7031b886795dfdf0d9be58445644038e1..789c66fd169ae44716896543600b6208b64e2ab9 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -486,6 +486,9 @@ static void r600_texture_alloc_cmask_separate(struct r600_common_screen *rscreen
 static void vi_texture_alloc_dcc_separate(struct r600_common_screen *rscreen,
                                              struct r600_texture *rtex)
 {
+       if (rscreen->debug_flags & DBG_NO_DCC)
+               return;
+
        rtex->dcc_buffer = (struct r600_resource *)
                r600_aligned_buffer_create(&rscreen->b, PIPE_BIND_CUSTOM,
                                   PIPE_USAGE_DEFAULT, rtex->surface.dcc_size, rtex->surface.dcc_alignment);
@@ -1371,6 +1374,9 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx,
                        uint32_t reset_value;
                        bool clear_words_needed;
 
+                       if (rctx->screen->debug_flags & DBG_NO_DCC_CLEAR)
+                               continue;
+
                        vi_get_fast_clear_parameters(fb->cbufs[i]->format, color, &reset_value, &clear_words_needed);
 
                        rctx->clear_buffer(&rctx->b, &tex->dcc_buffer->b.b,