Mesa (master): freedreno/a6xx: enable UBWC by default

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 832010f6acdc9a55ea9a12ad2dc9b96457e46b51
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=832010f6acdc9a55ea9a12ad2dc9b96457e46b51

Author: Rob Clark <robdclark at chromium.org>
Date:   Mon Jun 10 16:12:12 2019 -0700

freedreno/a6xx: enable UBWC by default

Flip the FD_MESA_DEBUG flag to a disable rather than enable, drop the
obsolete comment (and bonus, drop unused softpin debug flag)

Signed-off-by: Rob Clark <robdclark at chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>

---

 src/gallium/drivers/freedreno/freedreno_resource.c | 15 +--------------
 src/gallium/drivers/freedreno/freedreno_screen.c   |  3 +--
 src/gallium/drivers/freedreno/freedreno_util.h     |  3 +--
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 63908f994f2..bcc1efe3cad 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -970,20 +970,7 @@ fd_resource_create_with_modifiers(struct pipe_screen *pscreen,
 	if (tmpl->bind & PIPE_BIND_SHARED)
 		allow_ubwc = drm_find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, count);
 
-	/* TODO turn on UBWC for all internal buffers
-	 *
-	 * There are still some regressions in deqp with UBWC enabled.  I
-	 * think it is mostly related to sampler/image views using a format
-	 * that doesn't support compression with a resource created with
-	 * a format that does.  We need to track the compression state of
-	 * a buffer and do an (in-place, hopefully?) resolve if it is re-
-	 * interpreted with a format that does not support compression.
-	 *
-	 * It is possible (likely?) that we can't do atomic ops on a
-	 * compressed buffer as well, so this would also require transition
-	 * to a compressed state.
-	 */
-	allow_ubwc &= !!(fd_mesa_debug & FD_DBG_UBWC);
+	allow_ubwc &= !(fd_mesa_debug & FD_DBG_NOUBWC);
 
 	if (screen->tile_mode &&
 			(tmpl->target != PIPE_BUFFER) &&
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 12488ef9082..820b4468a8c 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -87,8 +87,7 @@ static const struct debug_named_value debug_options[] = {
 		{"hiprio",    FD_DBG_HIPRIO, "Force high-priority context"},
 		{"ttile",     FD_DBG_TTILE,  "Enable texture tiling (a5xx)"},
 		{"perfcntrs", FD_DBG_PERFC,  "Expose performance counters"},
-		{"softpin",   FD_DBG_SOFTPIN,"Enable softpin command submission (experimental)"},
-		{"ubwc",      FD_DBG_UBWC,   "Enable UBWC for all internal buffers (experimental)"},
+		{"noubwc",    FD_DBG_NOUBWC, "Disable UBWC for all internal buffers"},
 		DEBUG_NAMED_VALUE_END
 };
 
diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 2d1a473912e..4a971d93e7c 100644
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -84,8 +84,7 @@ enum adreno_stencil_op fd_stencil_op(unsigned op);
 #define FD_DBG_HIPRIO 0x100000
 #define FD_DBG_TTILE  0x200000
 #define FD_DBG_PERFC  0x400000
-#define FD_DBG_SOFTPIN 0x800000
-#define FD_DBG_UBWC  0x1000000
+#define FD_DBG_NOUBWC 0x800000
 extern int fd_mesa_debug;
 extern bool fd_binning_enabled;