Mesa (main): intel/genxml: align QM field names across gens.

[GitLab Mirror]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Nov 10 10:38:31 2021 +1000

intel/genxml: align QM field names across gens.

This just picks a consistent name.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13788>

---

 src/intel/genxml/gen11.xml  | 2 +-
 src/intel/genxml/gen12.xml  | 2 +-
 src/intel/genxml/gen125.xml | 2 +-
 src/intel/genxml/gen7.xml   | 4 +++-
 src/intel/genxml/gen75.xml  | 4 +++-
 src/intel/genxml/gen8.xml   | 4 +++-
 src/intel/genxml/gen9.xml   | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 62227a684e9..d2c95282f41 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -5348,7 +5348,7 @@
       <value name="JPEG_Chroma_Cr_QUANTIZER_MATRIX (or B)" value="2"/>
     </field>
     <group count="64" start="64" size="8">
-      <field name="Forward Quantizer Matrix 8x8" start="0" end="7" type="uint"/>
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
     </group>
   </instruction>
 
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 4ac58da1619..a2797d747eb 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -5522,7 +5522,7 @@
       <value name="JPEG_Chroma_Cr_QUANTIZER_MATRIX (or B)" value="2"/>
     </field>
     <group count="64" start="64" size="8">
-      <field name="Forward Quantizer Matrix 8x8" start="0" end="7" type="uint"/>
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
     </group>
   </instruction>
 
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 2513ef775c3..af035e9dce4 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -5804,7 +5804,7 @@
       <value name="JPEG_Chroma_Cr_QUANTIZER_MATRIX (or B)" value="2"/>
     </field>
     <group count="64" start="64" size="8">
-      <field name="Forward Quantizer Matrix 8x8" start="0" end="7" type="uint"/>
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
     </group>
   </instruction>
 
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index ba32eeb4aa4..8846149980e 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -3119,7 +3119,9 @@
       <value name="MPEG_INTRA_QUANTIZER_MATRIX" value="0"/>
       <value name="MPEG_NON_INTRA_QUANTIZER_MATRIX" value="1"/>
     </field>
-    <field name="Forward Quantizer Matrix" start="64" end="1087" type="uint"/>
+    <group count="64" start="64" size="8">
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
+    </group>
   </instruction>
 
   <instruction name="MFX_STATE_POINTER" bias="2" length="2" engine="video">
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index 22e6e841688..396fb5ad668 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -3429,7 +3429,9 @@
       <value name="MPEG_INTRA_QUANTIZER_MATRIX" value="0"/>
       <value name="MPEG_NON_INTRA_QUANTIZER_MATRIX" value="1"/>
     </field>
-    <field name="Forward Quantizer Matrix" start="64" end="1087" type="uint"/>
+    <group count="64" start="64" size="8">
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
+    </group>
   </instruction>
 
   <instruction name="MFX_STATE_POINTER" bias="2" length="2" engine="video">
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 52da4ffbad1..4e7f0569bd9 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -3759,7 +3759,9 @@
       <value name="MPEG_INTRA_QUANTIZER_MATRIX" value="0"/>
       <value name="MPEG_NON_INTRA_QUANTIZER_MATRIX" value="1"/>
     </field>
-    <field name="Forward Quantizer Matrix" start="64" end="1087" type="uint"/>
+    <group count="64" start="64" size="8">
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
+    </group>
   </instruction>
 
   <instruction name="MFX_STATE_POINTER" bias="2" length="2" engine="video">
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index f7e99ff5d8e..b9591bc4165 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -4988,7 +4988,7 @@
       <value name="JPEG_Chroma_Cr_QUANTIZER_MATRIX (or B)" value="2"/>
     </field>
     <group count="64" start="64" size="8">
-      <field name="Forward Quantizer 8x8" start="0" end="7" type="uint"/>
+      <field name="Forward Quantizer Matrix" start="0" end="7" type="uint"/>
     </group>
   </instruction>