Mesa (main): intel/genxml: cleanup video xml collisions.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Nov 15 20:32:20 UTC 2021
Module: Mesa
Branch: main
Commit: 5d956d65b65ba1f2377fa7c74f27b3c027afa555
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d956d65b65ba1f2377fa7c74f27b3c027afa555
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Nov 9 09:54:32 2021 +1000
intel/genxml: cleanup video xml collisions.
When you enable video genxml, lots of warnings about redefined things
appear, just clean those up before things get started.
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 | 8 ++++----
src/intel/genxml/gen12.xml | 6 +++---
src/intel/genxml/gen125.xml | 8 ++++----
src/intel/genxml/gen9.xml | 10 +++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 1b4a00e306d..62227a684e9 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -3094,7 +3094,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
- <field name="SizeID" start="33" end="34" type="uint">
+ <field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@@ -6607,11 +6607,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
- <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
+ <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
- <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
+ <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@@ -6750,7 +6750,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
- <field name="Standard Select" start="32" end="35" type="uint">
+ <field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 76d71007b65..4ac58da1619 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -6795,11 +6795,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
- <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
+ <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
- <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
+ <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@@ -6938,7 +6938,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
- <field name="Standard Select" start="32" end="35" type="uint">
+ <field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index bf6d0912269..2513ef775c3 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -3721,7 +3721,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
- <field name="SizeID" start="33" end="34" type="uint">
+ <field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@@ -7077,11 +7077,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
- <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
+ <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
- <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
+ <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@@ -7220,7 +7220,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
- <field name="Standard Select" start="32" end="35" type="uint">
+ <field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 9b8a8f71e05..f7e99ff5d8e 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -2879,7 +2879,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
- <field name="SizeID" start="33" end="34" type="uint">
+ <field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@@ -3153,7 +3153,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
- <field name="SizeID" start="33" end="34" type="uint">
+ <field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@@ -6192,11 +6192,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
- <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
+ <field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
- <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
+ <field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@@ -6322,7 +6322,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
- <field name="Standard Select" start="32" end="35" type="uint">
+ <field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="AVC" value="2"/>
</field>
<field name="Frame Statistics Stream-Out Enable" start="37" end="37" type="bool"/>
More information about the mesa-commit
mailing list