From cfc62802f88d1a277fa7a9e2cd2c2f0001cb1650 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 19 Jan 2023 13:38:34 +1000
Subject: [PATCH] intel/genxml: align some of the fields with the media driver

These values are taking from runtime interrogation of the media driver.

It would be nice to know if they are correct, but they work.

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20782>
---
 src/intel/genxml/gen11.xml  | 15 ++++++---------
 src/intel/genxml/gen12.xml  | 15 ++++++---------
 src/intel/genxml/gen125.xml | 15 ++++++---------
 src/intel/genxml/gen9.xml   | 15 ++++++---------
 4 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 6472fd402dd..cd95e6f559d 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -4149,11 +4149,11 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Inline Data" start="96" end="191" type="INLINE_DATA_DESCRIPTION_FOR_MFD_AVC_BSD_OBJECT" />
   </instruction>
   <instruction name="MFD_AVC_DPB_STATE" bias="2" length="27" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="25" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="6" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="1" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
@@ -4177,10 +4177,7 @@
       </field>
     </group>
     <group count="16" start="96" size="16">
-      <field name="LTST Frame Number List" start="0" end="15" type="uint" prefix="LTST">
-        <value name="Long Term Frame" value="1" />
-        <value name="Short Term Frame" value="0" />
-      </field>
+      <field name="LTST Frame Number List" start="0" end="15" type="uint" />
     </group>
     <group count="16" start="352" size="16">
       <field name="View ID" start="0" end="15" type="uint" />
@@ -4215,7 +4212,7 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Driver Provided NAL Type Value" start="96" end="103" type="uint" />
     <field name="AVC NAL Type First Byte Override" start="104" end="104" type="uint">
       <value name="Use Bitstream Decoded NAL Type" value="0" />
@@ -4479,8 +4476,8 @@
       <field name="POC List" start="0" end="31" type="uint" />
     </group>
   </instruction>
-  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="12" />
+  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="21" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="19" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="0" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 76c9e5be7bf..def65e96ed0 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -4317,11 +4317,11 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Inline Data" start="96" end="191" type="INLINE_DATA_DESCRIPTION_FOR_MFD_AVC_BSD_OBJECT" />
   </instruction>
   <instruction name="MFD_AVC_DPB_STATE" bias="2" length="27" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="25" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="6" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="1" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
@@ -4345,10 +4345,7 @@
       </field>
     </group>
     <group count="16" start="96" size="16">
-      <field name="LTST Frame Number List" start="0" end="15" type="uint" prefix="LTST">
-        <value name="Long Term Frame" value="1" />
-        <value name="Short Term Frame" value="0" />
-      </field>
+      <field name="LTST Frame Number List" start="0" end="15" type="uint" />
     </group>
     <group count="16" start="352" size="16">
       <field name="View ID" start="0" end="15" type="uint" />
@@ -4383,7 +4380,7 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Driver Provided NAL Type Value" start="96" end="103" type="uint" />
     <field name="AVC NAL Type First Byte Override" start="104" end="104" type="uint">
       <value name="Use Bitstream Decoded NAL Type" value="0" />
@@ -4647,8 +4644,8 @@
       <field name="POC List" start="0" end="31" type="uint" />
     </group>
   </instruction>
-  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="12" />
+  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="21" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="19" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="0" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index de2c7553cc6..aa8451f857d 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -4669,11 +4669,11 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Inline Data" start="96" end="191" type="INLINE_DATA_DESCRIPTION_FOR_MFD_AVC_BSD_OBJECT" />
   </instruction>
   <instruction name="MFD_AVC_DPB_STATE" bias="2" length="27" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="25" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="6" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="1" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
@@ -4697,10 +4697,7 @@
       </field>
     </group>
     <group count="16" start="96" size="16">
-      <field name="LTST Frame Number List" start="0" end="15" type="uint" prefix="LTST">
-        <value name="Long Term Frame" value="1" />
-        <value name="Short Term Frame" value="0" />
-      </field>
+      <field name="LTST Frame Number List" start="0" end="15" type="uint"/>
     </group>
     <group count="16" start="352" size="16">
       <field name="View ID" start="0" end="15" type="uint" />
@@ -4735,7 +4732,7 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Driver Provided NAL Type Value" start="96" end="103" type="uint" />
     <field name="AVC NAL Type First Byte Override" start="104" end="104" type="uint">
       <value name="Use Bitstream Decoded NAL Type" value="0" />
@@ -4999,8 +4996,8 @@
       <field name="POC List" start="0" end="31" type="uint" />
     </group>
   </instruction>
-  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="12" />
+  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="21" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="19" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="0" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index e18fce31b99..caa54d31eb2 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -3763,11 +3763,11 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
     <field name="Inline Data" start="96" end="191" type="INLINE_DATA_DESCRIPTION_FOR_MFD_AVC_BSD_OBJECT" />
   </instruction>
   <instruction name="MFD_AVC_DPB_STATE" bias="2" length="27" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="25" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="6" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="1" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />
@@ -3791,10 +3791,7 @@
       </field>
     </group>
     <group count="16" start="96" size="16">
-      <field name="LTST Frame Number List" start="0" end="15" type="uint" prefix="LTST">
-        <value name="Long Term Frame" value="1" />
-        <value name="Short Term Frame" value="0" />
-      </field>
+      <field name="LTST Frame Number List" start="0" end="15" type="uint"/>
     </group>
     <group count="16" start="352" size="16">
       <field name="View ID" start="0" end="15" type="uint" />
@@ -3829,7 +3826,7 @@
     <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="Indirect BSD Data Length" start="32" end="63" type="uint" />
-    <field name="Indirect BSD Data Start Address" start="64" end="92" type="address" />
+    <field name="Indirect BSD Data Start Address" start="64" end="92" type="offset" />
   </instruction>
   <instruction name="MFD_IT_OBJECT" bias="2" engine="video">
     <field name="DWord Length" start="0" end="11" type="uint" default="6" />
@@ -4088,8 +4085,8 @@
       <field name="POC List" start="0" end="31" type="uint" />
     </group>
   </instruction>
-  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" default="12" />
+  <instruction name="MFX_AVC_IMG_STATE" bias="2" length="21" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="19" />
     <field name="SubOpcode B" start="16" end="20" type="uint" default="0" />
     <field name="SubOpcode A" start="21" end="23" type="uint" default="0" />
     <field name="Media Command Opcode" start="24" end="26" type="uint" default="1" />