From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 10 May 2019 18:50:54 +0000 (-0700)
Subject: iris: Set MOCS for external surfaces to uncached
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b529db00eec1dda761ba41921b16f94e46d5dae2;p=mesa.git

iris: Set MOCS for external surfaces to uncached

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

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