From 27dcd182106bd03d189273b6a6e8176d9813914a Mon Sep 17 00:00:00 2001
From: Hyunjun Ko <zzoon@igalia.com>
Date: Mon, 24 Apr 2023 10:49:30 +0900
Subject: [PATCH] intel/genxml: align some fields on gen9/11/12/125 with media
 driver.

Most of them are length of each instruction and the rest are
some corrections on specific gens.

v1. Added a default value to DWordLength of each instruction.
( Lionel Landwerlin <lionel.g.landwerlin@intel.com> )

Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22202>
---
 src/intel/genxml/gen11.xml  | 34 ++++++++++++++++----------------
 src/intel/genxml/gen12.xml  | 39 ++++++++++++++++++++-----------------
 src/intel/genxml/gen125.xml | 39 ++++++++++++++++++++-----------------
 src/intel/genxml/gen9.xml   | 34 ++++++++++++++++----------------
 4 files changed, 76 insertions(+), 70 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index a20f72c3b14..0f9dd3863ca 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -2939,7 +2939,7 @@
     <field name="Bottom Execution Mask" start="448" end="479" type="uint" />
   </instruction>
   <instruction name="HCP_BSD_OBJECT" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="32" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2973,8 +2973,8 @@
       <field name="Quantizer Matrix 8x8" start="0" end="7" type="uint" />
     </group>
   </instruction>
-  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="29" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="27" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="3" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3045,8 +3045,8 @@
     <field name="SSE ClassID 32x32_3" start="140" end="143" type="uint" />
     <field name="LCU Force Zero Coeff" start="144" end="144" type="bool" />
   </instruction>
-  <instruction name="HCP_PIC_STATE" bias="2" length="31" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIC_STATE" bias="2" length="38" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="36" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="16" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3211,8 +3211,8 @@
     <field name="Cr QP Offset List[5]" start="1081" end="1085" type="int" />
     <field name="RDOQ Intra TU Threshold" start="1184" end="1199" type="uint" />
   </instruction>
-  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="104" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="121" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="119" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="2" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3282,7 +3282,7 @@
     <field name="HCP Scalability CABAC Decoded Syntax Elements Buffer Max Address" start="3808" end="3871" type="address" />
   </instruction>
   <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="4" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3314,8 +3314,8 @@
     <field name="Media Soft-Reset Counter" start="64" end="95" type="uint" />
     <field name="Pic Status/Error Report ID" start="96" end="127" type="uint" />
   </instruction>
-  <instruction name="HCP_QM_STATE" bias="2" length="34" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_QM_STATE" bias="2" length="18" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="4" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3362,7 +3362,7 @@
     </group>
   </instruction>
   <instruction name="HCP_REF_IDX_STATE" bias="2" length="18" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="18" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3373,8 +3373,8 @@
       <field name="Reference List Entry" start="0" end="31" type="HCP_REF_LIST_ENTRY" />
     </group>
   </instruction>
-  <instruction name="HCP_SLICE_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SLICE_STATE" bias="2" length="11" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="20" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3488,8 +3488,8 @@
     <field name="Transform Skip Number of Zero Coeffs Factor1" start="336" end="343" type="uint" />
     <field name="Transform Skip Number of Non-Zero Coeffs Factor1" start="344" end="351" type="uint" />
   </instruction>
-  <instruction name="HCP_SURFACE_STATE" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SURFACE_STATE" bias="2" length="4" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="2" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="1" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3552,7 +3552,7 @@
     <field name="HCP Scalability Synchronize Buffer - Attributes" start="480" end="511" type="MEMORYADDRESSATTRIBUTES" />
   </instruction>
   <instruction name="HCP_TILE_STATE" bias="2" length="17" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="15" />
     <field name="Media Instruction Command" start="16" end="22" type="uint" default="17" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3740,7 +3740,7 @@
     <field name="Segment LF Level Delta" start="240" end="246" type="int" />
   </instruction>
   <instruction name="HCP_WEIGHTOFFSET_STATE" bias="2" length="42" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="40" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="19" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index cb5993d78b6..5e21aad02f1 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -3107,7 +3107,7 @@
     <field name="Bottom Execution Mask" start="448" end="479" type="uint" />
   </instruction>
   <instruction name="HCP_BSD_OBJECT" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="32" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3141,8 +3141,8 @@
       <field name="Quantizer Matrix 8x8" start="0" end="7" type="uint" />
     </group>
   </instruction>
-  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="29" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="27" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="3" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3213,8 +3213,8 @@
     <field name="SSE ClassID 32x32_3" start="140" end="143" type="uint" />
     <field name="LCU Force Zero Coeff" start="144" end="144" type="bool" />
   </instruction>
-  <instruction name="HCP_PIC_STATE" bias="2" length="31" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIC_STATE" bias="2" length="41" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="39" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="16" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3379,8 +3379,8 @@
     <field name="Cr QP Offset List[5]" start="1081" end="1085" type="int" />
     <field name="RDOQ Intra TU Threshold" start="1184" end="1199" type="uint" />
   </instruction>
-  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="104" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="121" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="119" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="2" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3449,8 +3449,8 @@
     <field name="Intra Prediction Left Recon Column Store Buffer - Memory Address Attributes" start="3776" end="3807" type="MEMORYADDRESSATTRIBUTES" />
     <field name="HCP Scalability CABAC Decoded Syntax Elements Buffer Max Address" start="3808" end="3871" type="address" />
   </instruction>
-  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="7" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="5" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3482,8 +3482,8 @@
     <field name="Media Soft-Reset Counter" start="64" end="95" type="uint" />
     <field name="Pic Status/Error Report ID" start="96" end="127" type="uint" />
   </instruction>
-  <instruction name="HCP_QM_STATE" bias="2" length="34" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_QM_STATE" bias="2" length="18" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="4" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3530,7 +3530,7 @@
     </group>
   </instruction>
   <instruction name="HCP_REF_IDX_STATE" bias="2" length="18" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="18" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3541,8 +3541,8 @@
       <field name="Reference List Entry" start="0" end="31" type="HCP_REF_LIST_ENTRY" />
     </group>
   </instruction>
-  <instruction name="HCP_SLICE_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SLICE_STATE" bias="2" length="13" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="11" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="20" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3655,9 +3655,11 @@
     <field name="Transform Skip Number of Non-Zero Coeffs Factor0" start="328" end="335" type="uint" />
     <field name="Transform Skip Number of Zero Coeffs Factor1" start="336" end="343" type="uint" />
     <field name="Transform Skip Number of Non-Zero Coeffs Factor1" start="344" end="351" type="uint" />
+    <field name="Original Slice Start Ctb X" start="352" end="361" type="uint" />
+    <field name="Original Slice Start Ctb Y" start="368" end="377" type="uint" />
   </instruction>
-  <instruction name="HCP_SURFACE_STATE" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SURFACE_STATE" bias="2" length="5" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="3" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="1" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3669,6 +3671,7 @@
       <value name="Prev Reference Picture" value="2" />
       <value name="Golden Reference Picture" value="3" />
       <value name="AltRef Reference Picture" value="4" />
+      <value name="Reference Picture" value="5" />
     </field>
     <field name="Y Offset for U(Cb)" start="64" end="78" type="uint" />
     <field name="Surface Format" start="91" end="95" type="uint">
@@ -3720,7 +3723,7 @@
     <field name="HCP Scalability Synchronize Buffer - Attributes" start="480" end="511" type="MEMORYADDRESSATTRIBUTES" />
   </instruction>
   <instruction name="HCP_TILE_STATE" bias="2" length="17" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="15" />
     <field name="Media Instruction Command" start="16" end="22" type="uint" default="17" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3908,7 +3911,7 @@
     <field name="Segment LF Level Delta" start="240" end="246" type="int" />
   </instruction>
   <instruction name="HCP_WEIGHTOFFSET_STATE" bias="2" length="42" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="40" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="19" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 62de2fa936f..f7c79704b09 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -3633,7 +3633,7 @@
     </group>
   </instruction>
   <instruction name="HCP_BSD_OBJECT" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="32" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3667,8 +3667,8 @@
       <field name="Quantizer Matrix 8x8" start="0" end="7" type="uint" />
     </group>
   </instruction>
-  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="29" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="27" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="3" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3739,8 +3739,8 @@
     <field name="SSE ClassID 32x32_3" start="140" end="143" type="uint" />
     <field name="LCU Force Zero Coeff" start="144" end="144" type="bool" />
   </instruction>
-  <instruction name="HCP_PIC_STATE" bias="2" length="31" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIC_STATE" bias="2" length="41" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="39" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="16" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3905,8 +3905,8 @@
     <field name="Cr QP Offset List[5]" start="1081" end="1085" type="int" />
     <field name="RDOQ Intra TU Threshold" start="1184" end="1199" type="uint" />
   </instruction>
-  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="104" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="121" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="119" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="2" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3975,8 +3975,8 @@
     <field name="Intra Prediction Left Recon Column Store Buffer - Memory Address Attributes" start="3776" end="3807" type="MEMORYADDRESSATTRIBUTES" />
     <field name="HCP Scalability CABAC Decoded Syntax Elements Buffer Max Address" start="3808" end="3871" type="address" />
   </instruction>
-  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="7" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="5" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4008,8 +4008,8 @@
     <field name="Media Soft-Reset Counter" start="64" end="95" type="uint" />
     <field name="Pic Status/Error Report ID" start="96" end="127" type="uint" />
   </instruction>
-  <instruction name="HCP_QM_STATE" bias="2" length="34" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_QM_STATE" bias="2" length="18" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="4" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4056,7 +4056,7 @@
     </group>
   </instruction>
   <instruction name="HCP_REF_IDX_STATE" bias="2" length="18" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="18" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4067,8 +4067,8 @@
       <field name="Reference List Entry" start="0" end="31" type="HCP_REF_LIST_ENTRY" />
     </group>
   </instruction>
-  <instruction name="HCP_SLICE_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SLICE_STATE" bias="2" length="13" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="11" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="20" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4181,9 +4181,11 @@
     <field name="Transform Skip Number of Non-Zero Coeffs Factor0" start="328" end="335" type="uint" />
     <field name="Transform Skip Number of Zero Coeffs Factor1" start="336" end="343" type="uint" />
     <field name="Transform Skip Number of Non-Zero Coeffs Factor1" start="344" end="351" type="uint" />
+    <field name="Original Slice Start Ctb X" start="352" end="361" type="uint" />
+    <field name="Original Slice Start Ctb Y" start="368" end="377" type="uint" />
   </instruction>
-  <instruction name="HCP_SURFACE_STATE" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SURFACE_STATE" bias="2" length="5" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="3" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="1" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4195,6 +4197,7 @@
       <value name="Prev Reference Picture" value="2" />
       <value name="Golden Reference Picture" value="3" />
       <value name="AltRef Reference Picture" value="4" />
+      <value name="Reference Picture" value="5" />
     </field>
     <field name="Y Offset for U(Cb)" start="64" end="78" type="uint" />
     <field name="Surface Format" start="91" end="95" type="uint">
@@ -4246,7 +4249,7 @@
     <field name="HCP Scalability Synchronize Buffer - Attributes" start="480" end="511" type="MEMORYADDRESSATTRIBUTES" />
   </instruction>
   <instruction name="HCP_TILE_STATE" bias="2" length="17" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="15" />
     <field name="Media Instruction Command" start="16" end="22" type="uint" default="17" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -4434,7 +4437,7 @@
     <field name="Segment LF Level Delta" start="240" end="246" type="int" />
   </instruction>
   <instruction name="HCP_WEIGHTOFFSET_STATE" bias="2" length="42" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="40" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="19" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 66d2ae6285c..51de11eb0e9 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -2705,7 +2705,7 @@
     <field name="Bottom Execution Mask" start="448" end="479" type="uint" />
   </instruction>
   <instruction name="HCP_BSD_OBJECT" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="32" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2740,7 +2740,7 @@
     </group>
   </instruction>
   <instruction name="HCP_IND_OBJ_BASE_ADDR_STATE" bias="2" length="14" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="12" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="3" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2794,8 +2794,8 @@
     <field name="Current LCU X Address" start="64" end="79" type="uint" />
     <field name="Current LCU Y Address" start="80" end="95" type="uint" />
   </instruction>
-  <instruction name="HCP_PIC_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIC_STATE" bias="2" length="32" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="30" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="16" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2905,8 +2905,8 @@
       <value name="16Kb" value="1" />
     </field>
   </instruction>
-  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="95" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_BUF_ADDR_STATE" bias="2" length="104" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="102" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="2" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2958,8 +2958,8 @@
     <field name="VP9 HVD Tile Row Store Buffer - Address" start="2944" end="3007" type="address" />
     <field name="VP9 HVD Tile Row Store Buffer - Memory Address Attributes" start="3008" end="3039" type="MEMORYADDRESSATTRIBUTES" />
   </instruction>
-  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="4" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_PIPE_MODE_SELECT" bias="2" length="6" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="4" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="0" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -2979,9 +2979,10 @@
     <field name="PAK Frame Level Stream-Out Enable" start="44" end="44" type="bool" />
     <field name="Media Soft-Reset Counter" start="64" end="95" type="uint" />
     <field name="Pic Status/Error Report ID" start="96" end="127" type="uint" />
+    <field name="HprVp9ModeSwitchEcoDisable" start="134" end="134" type="bool" />
   </instruction>
-  <instruction name="HCP_QM_STATE" bias="2" length="34" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_QM_STATE" bias="2" length="18" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="4" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3007,7 +3008,7 @@
     </group>
   </instruction>
   <instruction name="HCP_REF_IDX_STATE" bias="2" length="18" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="16" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="18" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3018,8 +3019,8 @@
       <field name="Reference List Entry" start="0" end="31" type="HCP_REF_LIST_ENTRY" />
     </group>
   </instruction>
-  <instruction name="HCP_SLICE_STATE" bias="2" length="2" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+  <instruction name="HCP_SLICE_STATE" bias="2" length="11" engine="video">
+    <field name="DWord Length" start="0" end="11" type="uint" default="9" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="20" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3066,7 +3067,6 @@
       <value name="-2" value="30" />
       <value name="-1" value="31" />
     </field>
-    <field name="Last Slice of Tile" start="120" end="120" type="bool" />
     <field name="Slice Header Disable Deblocking Filter" start="128" end="128" type="bool" />
     <field name="Slice TC Offset Div2" start="129" end="132" type="int" />
     <field name="Slice Beta Offset Div2" start="133" end="136" type="int" />
@@ -3131,7 +3131,7 @@
     <field name="Transform Skip Number of Non-Zero Coeffs Factor1" start="344" end="351" type="uint" />
   </instruction>
   <instruction name="HCP_SURFACE_STATE" bias="2" length="3" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="1" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="1" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3159,7 +3159,7 @@
     <field name="SAO Parameter Offset" start="128" end="159" type="uint" />
   </instruction>
   <instruction name="HCP_TILE_STATE" bias="2" length="13" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="11" />
     <field name="Media Instruction Command" start="16" end="22" type="uint" default="17" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />
@@ -3295,7 +3295,7 @@
     <field name="Chroma AC Quant Scale" start="208" end="222" type="uint" />
   </instruction>
   <instruction name="HCP_WEIGHTOFFSET_STATE" bias="2" length="34" engine="video">
-    <field name="DWord Length" start="0" end="11" type="uint" />
+    <field name="DWord Length" start="0" end="11" type="uint" default="32" />
     <field name="SubOpcode" start="16" end="22" type="uint" default="19" />
     <field name="Media Command Opcode" start="23" end="26" type="uint" default="7" />
     <field name="Pipeline" start="27" end="28" type="uint" default="2" />