From 82d2db80bb0b7222063775fec7191b8da0392e9d Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 26 Feb 2016 16:11:33 -0800
Subject: [PATCH] genxml: Add MOCS fields to RENDER_SURFACE_STATE

This allows us to set MOCS as a single uint32_t on all platforms.
---
 src/intel/genxml/gen7.xml  | 1 +
 src/intel/genxml/gen75.xml | 1 +
 src/intel/genxml/gen8.xml  | 1 +
 src/intel/genxml/gen9.xml  | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 8faffcbf876..7e0fce0f04f 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -370,6 +370,7 @@
     <field name="X Offset" start="185" end="191" type="offset"/>
     <field name="Y Offset" start="180" end="183" type="offset"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="176" end="179" type="uint"/>
     <field name="Surface Min LOD" start="164" end="167" type="uint"/>
     <field name="MIP Count / LOD" start="160" end="163" type="uint"/>
     <field name="MCS Base Address" start="204" end="223" type="address"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index c1cbce9fdb6..f42c026d2f7 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -381,6 +381,7 @@
     <field name="X Offset" start="185" end="191" type="offset"/>
     <field name="Y Offset" start="180" end="183" type="offset"/>
     <field name="Surface Object Control State" start="176" end="179" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="176" end="179" type="uint"/>
     <field name="Surface Min LOD" start="164" end="167" type="uint"/>
     <field name="MIP Count / LOD" start="160" end="163" type="uint"/>
     <field name="MCS Base Address" start="204" end="223" type="address"/>
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index fff6ae2ed42..9a52fbaa330 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -292,6 +292,7 @@
     <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
     <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
     <field name="Memory Object Control State" start="56" end="62" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="56" end="62" type="uint"/>
     <field name="Base Mip Level" start="51" end="55" type="u4.1"/>
     <field name="Surface QPitch" start="32" end="46" type="uint"/>
     <field name="Height" start="80" end="93" type="uint"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 3f229b0d0fc..2b73f5f2a39 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -298,6 +298,7 @@
     <field name="Cube Face Enable - Positive X" start="4" end="4" type="bool"/>
     <field name="Cube Face Enable - Negative X" start="5" end="5" type="bool"/>
     <field name="Memory Object Control State" start="56" end="62" type="MEMORY_OBJECT_CONTROL_STATE"/>
+    <field name="MOCS" start="56" end="62" type="uint"/>
     <field name="Base Mip Level" start="51" end="55" type="u4.1"/>
     <field name="Surface QPitch" start="32" end="46" type="uint"/>
     <field name="Height" start="80" end="93" type="uint"/>
-- 
2.30.2