Mesa (master): genxml: Make MI_STORE_DATA_IMM have a single 64-bit data field

[Jason Ekstrand]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Mar 14 16:22:00 2017 -0700

genxml: Make MI_STORE_DATA_IMM have a single 64-bit data field

This is way more convenient than having two separate dword fields.

Reviewed-By: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/genxml/gen6.xml     | 3 +--
 src/intel/genxml/gen7.xml     | 3 +--
 src/intel/genxml/gen75.xml    | 3 +--
 src/intel/genxml/gen8.xml     | 3 +--
 src/intel/genxml/gen9.xml     | 3 +--
 src/intel/vulkan/genX_query.c | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 396d53601d..da3f64d3f0 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1806,8 +1806,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="address"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 7ef3158657..3f3b188221 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -2317,8 +2317,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="address"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 75d9d980d2..91fe02f048 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -2710,8 +2710,7 @@
     <field name="DWord Length" start="0" end="5" type="uint" default="2"/>
     <field name="Address" start="66" end="95" type="address"/>
     <field name="Core Mode Enable" start="64" end="64" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index c3830ebed0..f9899c6842 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -2981,8 +2981,7 @@
     <field name="DWord Length" start="0" end="9" type="uint" default="2"/>
     <field name="Address" start="34" end="79" type="address"/>
     <field name="Core Mode Enable" start="32" end="32" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index e98559ac73..bfe49320b0 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -3256,8 +3256,7 @@
     <field name="DWord Length" start="0" end="9" type="uint" default="2"/>
     <field name="Address" start="34" end="79" type="address"/>
     <field name="Core Mode Enable" start="32" end="32" type="uint"/>
-    <field name="Data DWord 0" start="96" end="127" type="uint"/>
-    <field name="Data DWord 1" start="128" end="159" type="uint"/>
+    <field name="Immediate Data" start="96" end="159" type="uint"/>
   </instruction>
 
   <instruction name="MI_STORE_DATA_INDEX" bias="2" length="3">
diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c
index 41122a437f..2bbca66ceb 100644
--- a/src/intel/vulkan/genX_query.c
+++ b/src/intel/vulkan/genX_query.c
@@ -283,8 +283,7 @@ void genX(CmdResetQueryPool)(
             .bo = &pool->bo,
             .offset = (firstQuery + i) * pool->stride,
          };
-         sdm.DataDWord0 = 0;
-         sdm.DataDWord1 = 0;
+         sdm.ImmediateData = 0;
       }
    }
 }