Mesa (master): intel/genxml: Fix pixel hashing 3DSTATE_3D_MODE field definitions for Gen12 and Gen12.5.

[GitLab Mirror]

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

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Wed Jan 13 19:50:00 2021 -0800

intel/genxml: Fix pixel hashing 3DSTATE_3D_MODE field definitions for Gen12 and Gen12.5.

The former "Subslice Hashing Mode" field is no longer used by the
hardware, Gen12 parts always do 16x16 subslice pixel hashing -- Remove
it since it's no longer useful.  In addition add a couple of bits that
will be useful in order to make some adjustments to the default pixel
pipe hashing behavior.

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8749>

---

 src/intel/genxml/gen12.xml  | 8 ++------
 src/intel/genxml/gen125.xml | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index f08d4ffa8f4..83af084854f 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -1278,12 +1278,8 @@
       <value name="Disable" value="1"/>
       <value name="hashing 32x32" value="3"/>
     </field>
-    <field name="Subslice Hashing Mode" start="34" end="35" type="uint">
-      <value name="hashing 8x8" value="0"/>
-      <value name="hashing 16x4" value="1"/>
-      <value name="hashing 8x4" value="2"/>
-      <value name="hashing 16x16" value="3"/>
-    </field>
+    <field name="3D Scoreboard Hashing Mode" start="36" end="36" type="bool"/>
+    <field name="Subslice Hashing Table Enable" start="37" end="37" type="bool"/>
     <field name="Slice Hashing Table Enable" start="38" end="38" type="bool"/>
     <field name="Mask" start="48" end="63" type="mbo"/>
   </instruction>
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index ef2aa1b0409..6ec73cd4b90 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -1286,12 +1286,8 @@
       <value name="Disable" value="1"/>
       <value name="hashing 32x32" value="3"/>
     </field>
-    <field name="Subslice Hashing Mode" start="34" end="35" type="uint">
-      <value name="hashing 8x8" value="0"/>
-      <value name="hashing 16x4" value="1"/>
-      <value name="hashing 8x4" value="2"/>
-      <value name="hashing 16x16" value="3"/>
-    </field>
+    <field name="3D Scoreboard Hashing Mode" start="36" end="36" type="bool"/>
+    <field name="Subslice Hashing Table Enable" start="37" end="37" type="bool"/>
     <field name="Slice Hashing Table Enable" start="38" end="38" type="bool"/>
     <field name="Mask" start="48" end="63" type="mbo"/>
   </instruction>