AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/genxml: align some of the fields with the media driver

Browse Source 
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>
This commit is contained in:
Dave Airlie
2023-01-19 13:38:34 +10:00
committed by Marge Bot
parent 3b110efccb
commit cfc62802f8
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/genxml/gen11.xml
+6 -9
View File
@@ -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" />
src/intel/genxml/gen12.xml
+6 -9
View File
@@ -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" />
src/intel/genxml/gen125.xml
+6 -9
View File
@@ -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" />
src/intel/genxml/gen9.xml
+6 -9
View File
@@ -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" />