Silence a bunch of warnings

[profile/ivi/vaapi-intel-driver.git] / src / gen75_vme.c

diff --git a/src/gen75_vme.c b/src/gen75_vme.c
index dc5730e..5853757 100644 (file)
--- a/src/gen75_vme.c
+++ b/src/gen75_vme.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <assert.h>
 
@@ -54,6 +55,7 @@
 
 #define VME_INTRA_SHADER        0
 #define VME_INTER_SHADER        1
+#define VME_BINTER_SHADER      3
 #define VME_BATCHBUFFER         2
 
 #define CURBE_ALLOCATION_SIZE   37              /* in 256-bit */
@@ -70,6 +72,10 @@ static const uint32_t gen75_vme_inter_frame[][4] = {
 #include "shaders/vme/inter_frame_haswell.g75b"
 };
 
+static const uint32_t gen75_vme_inter_bframe[][4] = {
+#include "shaders/vme/inter_bframe_haswell.g75b"
+};
+
 static const uint32_t gen75_vme_batchbuffer[][4] = {
 #include "shaders/vme/batchbuffer.g75b"
 };
@@ -96,6 +102,13 @@ static struct i965_kernel gen75_vme_kernels[] = {
         sizeof(gen75_vme_batchbuffer),
         NULL
     },
+    {
+        "VME inter BFrame",
+        VME_BINTER_SHADER,
+        gen75_vme_inter_bframe,
+        sizeof(gen75_vme_inter_bframe),
+        NULL
+    }
 };
 
 static const uint32_t gen75_vme_mpeg2_intra_frame[][4] = {
@@ -300,7 +313,7 @@ static VAStatus gen75_vme_interface_setup(VADriverContextP ctx,
     assert(bo->virtual);
     desc = bo->virtual;
 
-    for (i = 0; i < GEN6_VME_KERNEL_NUMBER; i++) {
+    for (i = 0; i < vme_context->vme_kernel_sum; i++) {
         struct i965_kernel *kernel;
         kernel = &vme_context->gpe_context.kernels[i];
         assert(sizeof(*desc) == 32);
@@ -439,7 +452,7 @@ static void gen75_vme_state_setup_fixup(VADriverContextP ctx,
     if (encoder_context->rate_control_mode == VA_RC_CQP)
         vme_state_message[0] = intra_mb_mode_cost_table[pic_param->pic_init_qp + slice_param->slice_qp_delta];
     else
-        vme_state_message[0] = intra_mb_mode_cost_table[mfc_context->bit_rate_control_context[slice_param->slice_type].QpPrimeY];
+        vme_state_message[0] = intra_mb_mode_cost_table[mfc_context->bit_rate_control_context[SLICE_TYPE_I].QpPrimeY];
 }
 
 static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
@@ -481,6 +494,7 @@ static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
+
 static void
 gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx, 
                                struct encode_state *encode_state,
@@ -494,12 +508,6 @@ gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx,
     int i, s;
     unsigned int *command_ptr;
 
-#define                INTRA_PRED_AVAIL_FLAG_AE        0x60
-#define                INTRA_PRED_AVAIL_FLAG_B         0x10
-#define                INTRA_PRED_AVAIL_FLAG_C         0x8
-#define                INTRA_PRED_AVAIL_FLAG_D         0x4
-#define                INTRA_PRED_AVAIL_FLAG_BCD_MASK  0x1C
-
     dri_bo_map(vme_context->vme_batchbuffer.bo, 1);
     command_ptr = vme_context->vme_batchbuffer.bo->virtual;
 
@@ -559,9 +567,7 @@ gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx,
 
 static void gen75_vme_media_init(VADriverContextP ctx, struct intel_encoder_context *encoder_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct gen6_vme_context *vme_context = encoder_context->vme_context;
-    dri_bo *bo;
 
     i965_gpe_context_init(ctx, &vme_context->gpe_context);
 
@@ -586,14 +592,42 @@ static void gen75_vme_pipeline_programing(VADriverContextP ctx,
     VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
     VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
     VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param_ext->buffer;
-    int is_intra = pSliceParameter->slice_type == SLICE_TYPE_I;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
     int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
+    int kernel_shader;
+    bool allow_hwscore = true;
+    int s;
 
-    gen75_vme_fill_vme_batchbuffer(ctx, 
+    for (s = 0; s < encode_state->num_slice_params_ext; s++) {
+        pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[s]->buffer; 
+        if ((pSliceParameter->macroblock_address % width_in_mbs)) {
+               allow_hwscore = false;
+               break;
+       }
+    }
+    if ((pSliceParameter->slice_type == SLICE_TYPE_I) ||
+       (pSliceParameter->slice_type == SLICE_TYPE_I)) {
+       kernel_shader = VME_INTRA_SHADER;
+   } else if ((pSliceParameter->slice_type == SLICE_TYPE_P) ||
+       (pSliceParameter->slice_type == SLICE_TYPE_SP)) {
+       kernel_shader = VME_INTER_SHADER;
+   } else {
+       kernel_shader = VME_BINTER_SHADER;
+       if (!allow_hwscore)
+            kernel_shader = VME_INTER_SHADER;
+   }
+    if (allow_hwscore)
+       gen7_vme_walker_fill_vme_batchbuffer(ctx, 
+                                  encode_state,
+                                  width_in_mbs, height_in_mbs,
+                                  kernel_shader,
+                                  pPicParameter->pic_fields.bits.transform_8x8_mode_flag,
+                                  encoder_context);
+    else
+       gen75_vme_fill_vme_batchbuffer(ctx, 
                                    encode_state,
                                    width_in_mbs, height_in_mbs,
-                                   is_intra ? VME_INTRA_SHADER : VME_INTER_SHADER,
+                                   kernel_shader,
                                    pPicParameter->pic_fields.bits.transform_8x8_mode_flag,
                                    encoder_context);
 
@@ -788,11 +822,6 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
     int i, s, j;
     unsigned int *command_ptr;
 
-#define                INTRA_PRED_AVAIL_FLAG_AE        0x60
-#define                INTRA_PRED_AVAIL_FLAG_B         0x10
-#define                INTRA_PRED_AVAIL_FLAG_C         0x8
-#define                INTRA_PRED_AVAIL_FLAG_D         0x4
-#define                INTRA_PRED_AVAIL_FLAG_BCD_MASK  0x1C
 
     dri_bo_map(vme_context->vme_batchbuffer.bo, 1);
     command_ptr = vme_context->vme_batchbuffer.bo->virtual;
@@ -960,6 +989,7 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
 {
     struct gen6_vme_context *vme_context = calloc(1, sizeof(struct gen6_vme_context));
     struct i965_kernel *vme_kernel_list = NULL;
+       int i965_kernel_num;
 
     switch (encoder_context->profile) {
     case VAProfileH264Baseline:
@@ -967,13 +997,14 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
     case VAProfileH264High:
         vme_kernel_list = gen75_vme_kernels;
         encoder_context->vme_pipeline = gen75_vme_pipeline;
-        
+               i965_kernel_num = sizeof(gen75_vme_kernels) / sizeof(struct i965_kernel); 
         break;
 
     case VAProfileMPEG2Simple:
     case VAProfileMPEG2Main:
         vme_kernel_list = gen75_vme_mpeg2_kernels;
         encoder_context->vme_pipeline = gen75_vme_mpeg2_pipeline;
+               i965_kernel_num = sizeof(gen75_vme_mpeg2_kernels) / sizeof(struct i965_kernel); 
 
         break;
 
@@ -983,7 +1014,7 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
 
         break;
     }
-
+    vme_context->vme_kernel_sum = i965_kernel_num;
     vme_context->gpe_context.surface_state_binding_table.length = (SURFACE_STATE_PADDED_SIZE + sizeof(unsigned int)) * MAX_MEDIA_SURFACES_GEN6;
 
     vme_context->gpe_context.idrt.max_entries = MAX_INTERFACE_DESC_GEN6;
@@ -997,10 +1028,12 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
     vme_context->gpe_context.vfe_state.urb_entry_size = 59 - 1;
     vme_context->gpe_context.vfe_state.curbe_allocation_size = CURBE_ALLOCATION_SIZE - 1;
 
+    gen7_vme_scoreboard_init(ctx, vme_context);
+
     i965_gpe_load_kernels(ctx,
                           &vme_context->gpe_context,
                           vme_kernel_list,
-                          GEN6_VME_KERNEL_NUMBER);
+                          i965_kernel_num);
     vme_context->vme_surface2_setup = gen7_gpe_surface2_setup;
     vme_context->vme_media_rw_surface_setup = gen7_gpe_media_rw_surface_setup;
     vme_context->vme_buffer_suface_setup = gen7_gpe_buffer_suface_setup;