From 353385c186f5884213f2842c798362c3c4f63d51 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Wed, 15 Mar 2023 13:49:06 +1000
Subject: [PATCH] fix gen7 bits

[dancingmirrors: Adapt for the current genxml format.]
---
 src/intel/genxml/gen70.xml          | 2 +-
 src/intel/vulkan_hasvk/genX_video.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/intel/genxml/gen70.xml b/src/intel/genxml/gen70.xml
index ddb861f..bbf279f 100644
--- a/src/intel/genxml/gen70.xml
+++ b/src/intel/genxml/gen70.xml
@@ -1793,7 +1793,7 @@
     <field name="Media Command Opcode" dword="0" bits="26:24" type="uint" default="1" />
     <field name="Pipeline" dword="0" bits="28:27" type="uint" default="2" />
     <field name="Command Type" dword="0" bits="31:29" type="uint" default="3" />
-    <group count="32" dword="33" size="32">
+    <group count="32" dword="1" size="32">
       <field name="Direct MV Buffer - Address" dword="0" bits="31:6" type="address" />
       <field name="Direct MV Buffer - Arbitration Priority Control" dword="0" bits="5:4" type="uint">
         <value name="Highest priority" value="0" />
diff --git a/src/intel/vulkan_hasvk/genX_video.c b/src/intel/vulkan_hasvk/genX_video.c
index 1e5a611..226a950 100644
--- a/src/intel/vulkan_hasvk/genX_video.c
+++ b/src/intel/vulkan_hasvk/genX_video.c
@@ -353,6 +353,12 @@ anv_h264_decode_video(struct anv_cmd_buffer *cmd_buffer,
             dmv_bo = anv_image_address(ref_iv->image,
                                        &ref_iv->image->vid_dmv_top_surface).bo;
          }
+#if GFX_VERx10 == 70
+         avc_directmode.DirectMVBufferAddress[idx * 2] = anv_image_address(ref_iv->image,
+                                                                           &ref_iv->image->vid_dmv_top_surface);
+         avc_directmode.DirectMVBufferAddress[idx * 2 + 1] = anv_image_address(ref_iv->image,
+                                                                           &ref_iv->image->vid_dmv_top_surface);
+#endif
 
 #if GFX_VERx10 == 75
          if (idx == 0)
@@ -368,6 +374,8 @@ anv_h264_decode_video(struct anv_cmd_buffer *cmd_buffer,
 #if GFX_VERx10 == 70
       avc_directmode.DirectMVBufferWriteAddress[0] = anv_image_address(img,
                                                                        &img->vid_dmv_top_surface);
+      avc_directmode.DirectMVBufferWriteAddress[1] = anv_image_address(img,
+                                                                       &img->vid_dmv_top_surface);
 #else
       avc_directmode.DirectMVBufferWriteAddress = anv_image_address(img,
                                                                     &img->vid_dmv_top_surface);