test: add null check assertions to object_heap tests

[android-x86/hardware-intel-common-vaapi.git] / src / gen9_mfd.c

diff --git a/src/gen9_mfd.c b/src/gen9_mfd.c
index 10171de..85a14f1 100644 (file)
--- a/src/gen9_mfd.c
+++ b/src/gen9_mfd.c
@@ -341,7 +341,7 @@ gen9_hcpd_ind_obj_base_addr_state(VADriverContextP ctx,
 
     OUT_BCS_BATCH(batch, HCP_IND_OBJ_BASE_ADDR_STATE | (14 - 2));
     OUT_BUFFER_MA_REFERENCE(slice_data_bo);        /* DW 1..3 */
-    OUT_BUFFER_NMA_REFERENCE(NULL);                /* DW 4..5, Upper Bound */
+    OUT_BCS_RELOC64(batch, slice_data_bo, I915_GEM_DOMAIN_RENDER, 0, ALIGN(slice_data_bo->size, 4096));
     OUT_BUFFER_MA_REFERENCE(NULL);                 /* DW 6..8, CU, ignored */
     OUT_BUFFER_MA_TARGET(NULL);                    /* DW 9..11, PAK-BSE, ignored */
     OUT_BUFFER_NMA_TARGET(NULL);                   /* DW 12..13, Upper Bound  */
@@ -1734,9 +1734,9 @@ gen9_hcpd_vp9_decode_picture(VADriverContextP ctx,
     //Only one VASliceParameterBufferVP9 should be sent per frame
     slice_data_bo = decode_state->slice_datas[0]->bo;
 
+    gen9_hcpd_vp9_pipe_buf_addr_state(ctx, decode_state, gen9_hcpd_context);
     gen9_hcpd_ind_obj_base_addr_state(ctx, slice_data_bo, gen9_hcpd_context);
 
-    gen9_hcpd_vp9_pipe_buf_addr_state(ctx, decode_state, gen9_hcpd_context);
     //If segmentation is disabled, only SegParam[0] is valid,
     //all others should be populated with 0
     if (!pic_param->pic_fields.bits.segmentation_enabled)