Merge Mesa 20.0.8

With Mesa 20.1 even after the kernel change to do wbinvd on all cpus
sthen@ reported that hard hangs still occurred on his Haswell system
with inteldrm.

Mark Kane also reported seeing hangs on Ivy Bridge on bugs@.

Some systems/workloads seem to be more prone to triggering this than
others as I have not seen any hangs on Ivy Bridge and the only hangs
I saw on Haswell when running piglit went away with the wbinvd change.

It seems something is wrong with drm memory attributes or coherency in
the kernel and newer Mesa versions expect behaviour we don't have.

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/mesa/src/gallium/drivers/freedreno/freedreno_util.h b/lib/mesa/src/gallium/drivers/freedreno/freedreno_util.h
index 6bd900e93..33b38472d 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/lib/mesa/src/gallium/drivers/freedreno/freedreno_util.h
@@ -69,10 +69,10 @@ enum fd_debug_flag {
 	FD_DBG_NOSCIS       = BITFIELD_BIT(4),
 	FD_DBG_DIRECT       = BITFIELD_BIT(5),
 	FD_DBG_NOBYPASS     = BITFIELD_BIT(6),
-	FD_DBG_LOG          = BITFIELD_BIT(7),
+	FD_DBG_FRAGHALF     = BITFIELD_BIT(7),
 	FD_DBG_NOBIN        = BITFIELD_BIT(8),
 	FD_DBG_NOGMEM       = BITFIELD_BIT(9),
-	/* BIT(10) */
+	FD_DBG_GLSL120      = BITFIELD_BIT(10),
 	FD_DBG_SHADERDB     = BITFIELD_BIT(11),
 	FD_DBG_FLUSH        = BITFIELD_BIT(12),
 	FD_DBG_DEQP         = BITFIELD_BIT(13),
@@ -88,8 +88,6 @@ enum fd_debug_flag {
 	FD_DBG_NOUBWC       = BITFIELD_BIT(23),
 	FD_DBG_NOLRZ        = BITFIELD_BIT(24),
 	FD_DBG_NOTILE       = BITFIELD_BIT(25),
-	FD_DBG_LAYOUT       = BITFIELD_BIT(26),
-	FD_DBG_NOFP16       = BITFIELD_BIT(27),
 };
 
 extern int fd_mesa_debug;