Mesa (master): iris: Set MOCS for external surfaces to uncached

[GitLab Mirror]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri May 10 11:50:54 2019 -0700

iris: Set MOCS for external surfaces to uncached

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/gallium/drivers/iris/iris_state.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index a53e76c004e..394781fd584 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -110,12 +110,16 @@
 #include "iris_genx_macros.h"
 #include "intel/common/gen_guardband.h"
 
-#if GEN_GEN == 8
-#define MOCS_PTE 0x18
-#define MOCS_WB 0x78
-#else
+#if GEN_GEN >= 12
+/* TODO: Set PTE to MOCS 61 when the kernel is ready */
+#define MOCS_PTE (3 << 1)
+#define MOCS_WB (2 << 1)
+#elif GEN_GEN >= 9
 #define MOCS_PTE (1 << 1)
 #define MOCS_WB  (2 << 1)
+#elif GEN_GEN == 8
+#define MOCS_PTE 0x18
+#define MOCS_WB 0x78
 #endif
 
 static uint32_t