OSDN Git Service

Add vdenc common commands for CNL
[android-x86/hardware-intel-common-vaapi.git] / src / gen75_vme.c
index 60eb19a..64b7dc0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Intel Corporation
+ * Copyright © 2010-2012 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * Authors:
  *    Zhao Yakui <yakui.zhao@intel.com>
  *    Xiang Haihao <haihao.xiang@intel.com>
+ *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <assert.h>
+#include "sysdeps.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 #include "gen6_vme.h"
 #include "gen6_mfc.h"
 
-#define SURFACE_STATE_PADDED_SIZE_0_GEN7        ALIGN(sizeof(struct gen7_surface_state), 32)
-#define SURFACE_STATE_PADDED_SIZE_1_GEN7        ALIGN(sizeof(struct gen7_surface_state2), 32)
-#define SURFACE_STATE_PADDED_SIZE_GEN7          MAX(SURFACE_STATE_PADDED_SIZE_0_GEN7, SURFACE_STATE_PADDED_SIZE_1_GEN7)
-
-#define SURFACE_STATE_PADDED_SIZE_0_GEN6        ALIGN(sizeof(struct i965_surface_state), 32)
-#define SURFACE_STATE_PADDED_SIZE_1_GEN6        ALIGN(sizeof(struct i965_surface_state2), 32)
-#define SURFACE_STATE_PADDED_SIZE_GEN6          MAX(SURFACE_STATE_PADDED_SIZE_0_GEN6, SURFACE_STATE_PADDED_SIZE_1_GEN6)
-
 #define SURFACE_STATE_PADDED_SIZE               MAX(SURFACE_STATE_PADDED_SIZE_GEN6, SURFACE_STATE_PADDED_SIZE_GEN7)
 #define SURFACE_STATE_OFFSET(index)             (SURFACE_STATE_PADDED_SIZE * index)
 #define BINDING_TABLE_OFFSET(index)             (SURFACE_STATE_OFFSET(MAX_MEDIA_SURFACES_GEN6) + sizeof(unsigned int) * index)
 
 #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 */
 #define CURBE_TOTAL_DATA_LENGTH (4 * 32)        /* in byte, it should be less than or equal to CURBE_ALLOCATION_SIZE * 32 */
 #define CURBE_URB_ENTRY_LENGTH  4               /* in 256-bit, it should be less than or equal to CURBE_TOTAL_DATA_LENGTH / 32 */
 
-#define VME_MSG_LENGTH         32
-  
-#define                MB_SCOREBOARD_A         (1 << 0)
-#define                MB_SCOREBOARD_B         (1 << 1)
-#define                MB_SCOREBOARD_C         (1 << 2)
+#define VME_MSG_LENGTH      32
 
 static const uint32_t gen75_vme_intra_frame[][4] = {
 #include "shaders/vme/intra_frame_haswell.g75b"
@@ -75,6 +61,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"
 };
@@ -83,8 +73,8 @@ static struct i965_kernel gen75_vme_kernels[] = {
     {
         "VME Intra Frame",
         VME_INTRA_SHADER, /*index*/
-        gen75_vme_intra_frame,                         
-        sizeof(gen75_vme_intra_frame),         
+        gen75_vme_intra_frame,
+        sizeof(gen75_vme_intra_frame),
         NULL
     },
     {
@@ -101,6 +91,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] = {
@@ -108,7 +105,7 @@ static const uint32_t gen75_vme_mpeg2_intra_frame[][4] = {
 };
 
 static const uint32_t gen75_vme_mpeg2_inter_frame[][4] = {
-#include "shaders/vme/mpeg2_inter_frame_haswell.g75b"
+#include "shaders/vme/mpeg2_inter_haswell.g75b"
 };
 
 static const uint32_t gen75_vme_mpeg2_batchbuffer[][4] = {
@@ -119,8 +116,8 @@ static struct i965_kernel gen75_vme_mpeg2_kernels[] = {
     {
         "VME Intra Frame",
         VME_INTRA_SHADER, /*index*/
-        gen75_vme_mpeg2_intra_frame,                   
-        sizeof(gen75_vme_mpeg2_intra_frame),           
+        gen75_vme_mpeg2_intra_frame,
+        sizeof(gen75_vme_mpeg2_intra_frame),
         NULL
     },
     {
@@ -140,7 +137,7 @@ static struct i965_kernel gen75_vme_mpeg2_kernels[] = {
 };
 
 /* only used for VME source surface state */
-static void 
+static void
 gen75_vme_source_surface_state(VADriverContextP ctx,
                                int index,
                                struct object_surface *obj_surface,
@@ -167,7 +164,8 @@ gen75_vme_media_source_surface_state(VADriverContextP ctx,
                                             &vme_context->gpe_context,
                                             obj_surface,
                                             BINDING_TABLE_OFFSET(index),
-                                            SURFACE_STATE_OFFSET(index));
+                                            SURFACE_STATE_OFFSET(index),
+                                            0);
 }
 
 static void
@@ -182,7 +180,8 @@ gen75_vme_media_chroma_source_surface_state(VADriverContextP ctx,
                                                 &vme_context->gpe_context,
                                                 obj_surface,
                                                 BINDING_TABLE_OFFSET(index),
-                                                SURFACE_STATE_OFFSET(index));
+                                                SURFACE_STATE_OFFSET(index),
+                                                0);
 }
 
 static void
@@ -213,7 +212,7 @@ gen75_vme_output_buffer_setup(VADriverContextP ctx,
      * 16 * (2 + 2 * (1 + 8 + 2))= 16 * 24.
      */
 
-    vme_context->vme_output.bo = dri_bo_alloc(i965->intel.bufmgr, 
+    vme_context->vme_output.bo = dri_bo_alloc(i965->intel.bufmgr,
                                               "VME output buffer",
                                               vme_context->vme_output.num_blocks * vme_context->vme_output.size_block,
                                               0x1000);
@@ -241,7 +240,7 @@ gen75_vme_output_vme_batchbuffer_setup(VADriverContextP ctx,
     vme_context->vme_batchbuffer.num_blocks = width_in_mbs * height_in_mbs + 1;
     vme_context->vme_batchbuffer.size_block = 64; /* 4 OWORDs */
     vme_context->vme_batchbuffer.pitch = 16;
-    vme_context->vme_batchbuffer.bo = dri_bo_alloc(i965->intel.bufmgr, 
+    vme_context->vme_batchbuffer.bo = dri_bo_alloc(i965->intel.bufmgr,
                                                    "VME batchbuffer",
                                                    vme_context->vme_batchbuffer.num_blocks * vme_context->vme_batchbuffer.size_block,
                                                    0x1000);
@@ -253,50 +252,49 @@ gen75_vme_output_vme_batchbuffer_setup(VADriverContextP ctx,
 }
 
 static VAStatus
-gen75_vme_surface_setup(VADriverContextP ctx, 
+gen75_vme_surface_setup(VADriverContextP ctx,
                         struct encode_state *encode_state,
                         int is_intra,
                         struct intel_encoder_context *encoder_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct object_surface *obj_surface;
-    VAEncPictureParameterBufferH264 *pPicParameter = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
 
     /*Setup surfaces state*/
     /* current picture for encoding */
-    obj_surface = SURFACE(encoder_context->input_yuv_surface);
-    assert(obj_surface);
+    obj_surface = encode_state->input_yuv_object;
     gen75_vme_source_surface_state(ctx, 0, obj_surface, encoder_context);
     gen75_vme_media_source_surface_state(ctx, 4, obj_surface, encoder_context);
     gen75_vme_media_chroma_source_surface_state(ctx, 6, obj_surface, encoder_context);
 
     if (!is_intra) {
-        /* reference 0 */
-        obj_surface = SURFACE(pPicParameter->ReferenceFrames[0].picture_id);
-        assert(obj_surface);
-        if ( obj_surface->bo != NULL)
-            gen75_vme_source_surface_state(ctx, 1, obj_surface, encoder_context);
+        VAEncSliceParameterBufferH264 *slice_param = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
+        int slice_type;
 
-        /* reference 1 */
-        obj_surface = SURFACE(pPicParameter->ReferenceFrames[1].picture_id);
-        assert(obj_surface);
-        if ( obj_surface->bo != NULL ) 
-            gen75_vme_source_surface_state(ctx, 2, obj_surface, encoder_context);
+        slice_type = intel_avc_enc_slice_type_fixup(slice_param->slice_type);
+        assert(slice_type != SLICE_TYPE_I && slice_type != SLICE_TYPE_SI);
+
+        intel_avc_vme_reference_state(ctx, encode_state, encoder_context, 0, 1, gen75_vme_source_surface_state);
+
+        if (slice_type == SLICE_TYPE_B)
+            intel_avc_vme_reference_state(ctx, encode_state, encoder_context, 1, 2, gen75_vme_source_surface_state);
     }
 
     /* VME output */
     gen75_vme_output_buffer_setup(ctx, encode_state, 3, encoder_context);
     gen75_vme_output_vme_batchbuffer_setup(ctx, encode_state, 5, encoder_context);
+    intel_h264_setup_cost_surface(ctx, encode_state, encoder_context,
+                                  BINDING_TABLE_OFFSET(INTEL_COST_TABLE_OFFSET),
+                                  SURFACE_STATE_OFFSET(INTEL_COST_TABLE_OFFSET));
 
     return VA_STATUS_SUCCESS;
 }
 
-static VAStatus gen75_vme_interface_setup(VADriverContextP ctx, 
+static VAStatus gen75_vme_interface_setup(VADriverContextP ctx,
                                           struct encode_state *encode_state,
                                           struct intel_encoder_context *encoder_context)
 {
     struct gen6_vme_context *vme_context = encoder_context->vme_context;
-    struct gen6_interface_descriptor_data *desc;   
+    struct gen6_interface_descriptor_data *desc;
     int i;
     dri_bo *bo;
 
@@ -305,7 +303,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);
@@ -318,9 +316,9 @@ static VAStatus gen75_vme_interface_setup(VADriverContextP ctx,
         desc->desc3.binding_table_pointer = (BINDING_TABLE_OFFSET(0) >> 5);
         desc->desc4.constant_urb_entry_read_offset = 0;
         desc->desc4.constant_urb_entry_read_length = CURBE_URB_ENTRY_LENGTH;
-               
+
         /*kernel start*/
-        dri_bo_emit_reloc(bo,  
+        dri_bo_emit_reloc(bo,
                           I915_GEM_DOMAIN_INSTRUCTION, 0,
                           0,
                           i * sizeof(*desc) + offsetof(struct gen6_interface_descriptor_data, desc0),
@@ -332,9 +330,10 @@ static VAStatus gen75_vme_interface_setup(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
-static VAStatus gen75_vme_constant_setup(VADriverContextP ctx, 
+static VAStatus gen75_vme_constant_setup(VADriverContextP ctx,
                                          struct encode_state *encode_state,
-                                         struct intel_encoder_context *encoder_context)
+                                         struct intel_encoder_context *encoder_context,
+                                         int denom)
 {
     struct gen6_vme_context *vme_context = encoder_context->vme_context;
     unsigned char *constant_buffer;
@@ -343,18 +342,16 @@ static VAStatus gen75_vme_constant_setup(VADriverContextP ctx,
 
     vme_state_message = (unsigned int *)vme_context->vme_state_message;
 
-    if (encoder_context->profile == VAProfileH264Baseline ||
-        encoder_context->profile == VAProfileH264Main ||
-        encoder_context->profile == VAProfileH264High) {
+    if (encoder_context->codec == CODEC_H264 ||
+        encoder_context->codec == CODEC_H264_MVC) {
         if (vme_context->h264_level >= 30) {
-            mv_num = 16;
-        
+            mv_num = 16 / denom;
+
             if (vme_context->h264_level >= 31)
-                mv_num = 8;
-        } 
-    } else if (encoder_context->profile == VAProfileMPEG2Simple ||
-               encoder_context->profile == VAProfileMPEG2Main) {
-        mv_num = 2;
+                mv_num = 8 / denom;
+        }
+    } else if (encoder_context->codec == CODEC_MPEG2) {
+        mv_num = 2 / denom;
     }
 
     vme_state_message[31] = mv_num;
@@ -368,7 +365,7 @@ static VAStatus gen75_vme_constant_setup(VADriverContextP ctx,
      * in the GPU shader.
      */
     memcpy(constant_buffer, (char *)vme_context->vme_state_message, 128);
-       
+
     dri_bo_unmap(vme_context->gpe_context.curbe.bo);
 
     return VA_STATUS_SUCCESS;
@@ -444,7 +441,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->brc.qp_prime_y[encoder_context->layer.curr_frame_layer_id][SLICE_TYPE_I]];
 }
 
 static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
@@ -455,7 +452,7 @@ static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
     struct gen6_vme_context *vme_context = encoder_context->vme_context;
     unsigned int *vme_state_message;
     int i;
-       
+
     //pass the MV/Mb cost into VME message on HASWell
     assert(vme_context->vme_state_message);
     vme_state_message = (unsigned int *)vme_context->vme_state_message;
@@ -466,14 +463,13 @@ static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
     vme_state_message[3] = 0x22120200;
     vme_state_message[4] = 0x62524232;
 
-    for (i=5; i < 8; i++) {
-       vme_state_message[i] = 0;
+    for (i = 5; i < 8; i++) {
+        vme_state_message[i] = 0;
     }
 
-    switch (encoder_context->profile) {
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
+    switch (encoder_context->codec) {
+    case CODEC_H264:
+    case CODEC_H264_MVC:
         gen75_vme_state_setup_fixup(ctx, encode_state, encoder_context, vme_state_message);
 
         break;
@@ -486,14 +482,8 @@ static VAStatus gen75_vme_vme_state_setup(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
-#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
-
 static void
-gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx, 
+gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx,
                                struct encode_state *encode_state,
                                int mb_width, int mb_height,
                                int kernel,
@@ -504,200 +494,74 @@ gen75_vme_fill_vme_batchbuffer(VADriverContextP ctx,
     int mb_x = 0, mb_y = 0;
     int i, s;
     unsigned int *command_ptr;
+    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
+    VAEncPictureParameterBufferH264 *pic_param = (VAEncPictureParameterBufferH264 *)encode_state->pic_param_ext->buffer;
+    VAEncSliceParameterBufferH264 *slice_param = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[0]->buffer;
+    int qp;
+    int slice_type = intel_avc_enc_slice_type_fixup(slice_param->slice_type);
+    int qp_mb, qp_index;
+
+    if (encoder_context->rate_control_mode == VA_RC_CQP)
+        qp = pic_param->pic_init_qp + slice_param->slice_qp_delta;
+    else
+        qp = mfc_context->brc.qp_prime_y[encoder_context->layer.curr_frame_layer_id][slice_type];
 
     dri_bo_map(vme_context->vme_batchbuffer.bo, 1);
     command_ptr = vme_context->vme_batchbuffer.bo->virtual;
 
     for (s = 0; s < encode_state->num_slice_params_ext; s++) {
-        VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[s]->buffer; 
+        VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[s]->buffer;
         int slice_mb_begin = pSliceParameter->macroblock_address;
         int slice_mb_number = pSliceParameter->num_macroblocks;
         unsigned int mb_intra_ub;
-       int slice_mb_x = pSliceParameter->macroblock_address % mb_width; 
-        for (i = 0; i < slice_mb_number;  ) {
-            int mb_count = i + slice_mb_begin;    
+        int slice_mb_x = pSliceParameter->macroblock_address % mb_width;
+        for (i = 0; i < slice_mb_number;) {
+            int mb_count = i + slice_mb_begin;
             mb_x = mb_count % mb_width;
             mb_y = mb_count / mb_width;
-           mb_intra_ub = 0;
-           if (mb_x != 0) {
-               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_AE;
-           }
-           if (mb_y != 0) {
-               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_B;
-               if (mb_x != 0)
+            mb_intra_ub = 0;
+            if (mb_x != 0) {
+                mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_AE;
+            }
+            if (mb_y != 0) {
+                mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_B;
+                if (mb_x != 0)
                     mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_D;
-               if (mb_x != (mb_width -1))
+                if (mb_x != (mb_width - 1))
                     mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
-           }
-           if (i < mb_width) {
-               if (i == 0)
+            }
+            if (i < mb_width) {
+                if (i == 0)
                     mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_AE);
-               mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_BCD_MASK);
-               if ((i == (mb_width - 1)) && slice_mb_x) {
+                mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_BCD_MASK);
+                if ((i == (mb_width - 1)) && slice_mb_x) {
                     mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
-               }
-           }
-               
-           if ((i == mb_width) && slice_mb_x) {
-               mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_D);
-           }
-            *command_ptr++ = (CMD_MEDIA_OBJECT | (8 - 2));
+                }
+            }
+
+            if ((i == mb_width) && slice_mb_x) {
+                mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_D);
+            }
+            *command_ptr++ = (CMD_MEDIA_OBJECT | (9 - 2));
             *command_ptr++ = kernel;
             *command_ptr++ = 0;
             *command_ptr++ = 0;
             *command_ptr++ = 0;
             *command_ptr++ = 0;
-   
+
             /*inline data */
             *command_ptr++ = (mb_width << 16 | mb_y << 8 | mb_x);
-            *command_ptr++ = ( (1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
+            *command_ptr++ = ((encoder_context->quality_level << 24) | (1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
+            /* qp occupies one byte */
+            if (vme_context->roi_enabled) {
+                qp_index = mb_y * mb_width + mb_x;
+                qp_mb = *(vme_context->qp_per_mb + qp_index);
+            } else
+                qp_mb = qp;
+            *command_ptr++ = qp_mb;
 
             i += 1;
-        } 
-    }
-
-    *command_ptr++ = 0;
-    *command_ptr++ = MI_BATCH_BUFFER_END;
-
-    dri_bo_unmap(vme_context->vme_batchbuffer.bo);
-}
-
-/* check whether the mb of (x_index, y_index) is out of bound */
-static inline int loop_in_bounds(int x_index, int y_index, int first_mb, int num_mb, int mb_width, int mb_height)
-{
-       int mb_index;
-       if (x_index < 0 || x_index >= mb_width)
-               return -1;
-       if (y_index < 0 || y_index >= mb_height)
-               return -1;
-       
-       mb_index = y_index * mb_width + x_index;
-       if (mb_index < first_mb || mb_index > (first_mb + num_mb))
-               return -1;
-       return 0;
-}
-
-
-static void
-gen75_vme_walker_fill_vme_batchbuffer(VADriverContextP ctx, 
-                              struct encode_state *encode_state,
-                              int mb_width, int mb_height,
-                              int kernel,
-                              int transform_8x8_mode_flag,
-                              struct intel_encoder_context *encoder_context)
-{
-    struct gen6_vme_context *vme_context = encoder_context->vme_context;
-    int mb_x = 0, mb_y = 0;
-    int mb_row;
-    int s;
-    unsigned int *command_ptr;
-    int temp;
-
-
-#define                USE_SCOREBOARD          (1 << 21)
-    dri_bo_map(vme_context->vme_batchbuffer.bo, 1);
-    command_ptr = vme_context->vme_batchbuffer.bo->virtual;
-
-    for (s = 0; s < encode_state->num_slice_params_ext; s++) {
-        VAEncSliceParameterBufferH264 *pSliceParameter = (VAEncSliceParameterBufferH264 *)encode_state->slice_params_ext[s]->buffer; 
-        int first_mb = pSliceParameter->macroblock_address;
-        int num_mb = pSliceParameter->num_macroblocks;
-        unsigned int mb_intra_ub, score_dep;
-       int x_outer, y_outer, x_inner, y_inner;
-
-       x_outer = first_mb % mb_width;
-       y_outer = first_mb / mb_width;
-       mb_row = y_outer;
-                                
-       for (; x_outer < (mb_width -2 ) && !loop_in_bounds(x_outer, y_outer, first_mb, num_mb, mb_width, mb_height); ) {
-               x_inner = x_outer;
-               y_inner = y_outer;
-               for (; !loop_in_bounds(x_inner, y_inner, first_mb, num_mb, mb_width, mb_height);) {
-                       mb_intra_ub = 0;
-                       score_dep = 0;
-                       if (x_inner != 0) {
-                               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_AE;
-                               score_dep |= MB_SCOREBOARD_A; 
-                       }
-                       if (y_inner != mb_row) {
-                               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_B;
-                               score_dep |= MB_SCOREBOARD_B;
-                               if (x_inner != 0)
-                                       mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_D;
-                               if (x_inner != (mb_width -1)) {
-                                       mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
-                                       score_dep |= MB_SCOREBOARD_C;
-                               }
-                       }
-                                                       
-                       *command_ptr++ = (CMD_MEDIA_OBJECT | (8 - 2));
-                       *command_ptr++ = kernel;
-                       *command_ptr++ = USE_SCOREBOARD;
-                       /* Indirect data */
-                       *command_ptr++ = 0;
-                       /* the (X, Y) term of scoreboard */
-                       *command_ptr++ = ((y_inner << 16) | x_inner);
-                       *command_ptr++ = score_dep;
-
-                       /*inline data */
-                       *command_ptr++ = (mb_width << 16 | y_inner << 8 | x_inner);
-                       *command_ptr++ = ((1 << 18) | (1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
-                       x_inner -= 2;
-                       y_inner += 1;
-               }
-               x_outer += 1;
-       }
-
-       x_outer = mb_width - 2;
-       y_outer = first_mb / mb_width;
-       temp = 0;
-       for (;!loop_in_bounds(x_outer, y_outer, first_mb, num_mb, mb_width, mb_height); ) { 
-               y_inner = y_outer;
-               x_inner = x_outer;
-               for (; !loop_in_bounds(x_inner, y_inner, first_mb, num_mb, mb_width, mb_height);) {
-                       mb_intra_ub = 0;
-                       score_dep = 0;
-                       if (x_inner != 0) {
-                               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_AE;
-                               score_dep |= MB_SCOREBOARD_A; 
-                       }
-                       if (y_inner != mb_row) {
-                               mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_B;
-                               score_dep |= MB_SCOREBOARD_B;
-                               if (x_inner != 0)
-                                       mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_D;
-                               if (x_inner != (mb_width -1)) {
-                                       mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
-                                       score_dep |= MB_SCOREBOARD_C;
-                               }
-                       }
-
-                       *command_ptr++ = (CMD_MEDIA_OBJECT | (8 - 2));
-                       *command_ptr++ = kernel;
-                       *command_ptr++ = USE_SCOREBOARD;
-                       /* Indirect data */
-                       *command_ptr++ = 0;
-                       /* the (X, Y) term of scoreboard */
-                       *command_ptr++ = ((y_inner << 16) | x_inner);
-                       *command_ptr++ = score_dep;
-
-                       /*inline data */
-                       *command_ptr++ = (mb_width << 16 | y_inner << 8 | x_inner);
-                       *command_ptr++ = ((1 << 18) | (1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
-
-                       x_inner -= 2;
-                       y_inner += 1;
-               }
-               temp++;
-               if (temp == 2) {
-                       y_outer += 1;
-                       temp = 0;
-                       x_outer = mb_width - 2;
-               } else {
-                       x_outer++;
-               }       
-       }
+        }
     }
 
     *command_ptr++ = 0;
@@ -708,9 +572,7 @@ gen75_vme_walker_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);
 
@@ -726,7 +588,7 @@ static void gen75_vme_media_init(VADriverContextP ctx, struct intel_encoder_cont
     vme_context->vme_state.bo = NULL;
 }
 
-static void gen75_vme_pipeline_programing(VADriverContextP ctx, 
+static void gen75_vme_pipeline_programing(VADriverContextP ctx,
                                           struct encode_state *encode_state,
                                           struct intel_encoder_context *encoder_context)
 {
@@ -735,49 +597,65 @@ 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;
-
-    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;
-       }
+    unsigned int is_low_quality = (encoder_context->quality_level == ENCODER_LOW_QUALITY);
+
+    if (is_low_quality)
+        allow_hwscore = false;
+    else {
+        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_SI)) {
+        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)
-       gen75_vme_walker_fill_vme_batchbuffer(ctx, 
-                                  encode_state,
-                                  width_in_mbs, height_in_mbs,
-                                  is_intra ? VME_INTRA_SHADER : VME_INTER_SHADER,
-                                  pPicParameter->pic_fields.bits.transform_8x8_mode_flag,
-                                  encoder_context);
+        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,
-                                   pPicParameter->pic_fields.bits.transform_8x8_mode_flag,
-                                   encoder_context);
+        gen75_vme_fill_vme_batchbuffer(ctx,
+                                       encode_state,
+                                       width_in_mbs, height_in_mbs,
+                                       kernel_shader,
+                                       pPicParameter->pic_fields.bits.transform_8x8_mode_flag,
+                                       encoder_context);
 
     intel_batchbuffer_start_atomic(batch, 0x1000);
     gen6_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
     BEGIN_BATCH(batch, 2);
-    OUT_BATCH(batch, MI_BATCH_BUFFER_START | (2 << 6));
+    OUT_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8));
     OUT_RELOC(batch,
               vme_context->vme_batchbuffer.bo,
-              I915_GEM_DOMAIN_COMMAND, 0, 
+              I915_GEM_DOMAIN_COMMAND, 0,
               0);
     ADVANCE_BATCH(batch);
 
-    intel_batchbuffer_end_atomic(batch);       
+    intel_batchbuffer_end_atomic(batch);
 }
 
-static VAStatus gen75_vme_prepare(VADriverContextP ctx, 
+static VAStatus gen75_vme_prepare(VADriverContextP ctx,
                                   struct encode_state *encode_state,
                                   struct intel_encoder_context *encoder_context)
 {
@@ -789,16 +667,18 @@ static VAStatus gen75_vme_prepare(VADriverContextP ctx,
 
     if (!vme_context->h264_level ||
         (vme_context->h264_level != pSequenceParameter->level_idc)) {
-       vme_context->h264_level = pSequenceParameter->level_idc;        
-    }  
+        vme_context->h264_level = pSequenceParameter->level_idc;
+    }
 
     intel_vme_update_mbmv_cost(ctx, encode_state, encoder_context);
-       
+    intel_h264_initialize_mbmv_cost(ctx, encode_state, encoder_context);
+    intel_h264_enc_roi_config(ctx, encode_state, encoder_context);
+
     /*Setup all the memory object*/
     gen75_vme_surface_setup(ctx, encode_state, is_intra, encoder_context);
     gen75_vme_interface_setup(ctx, encode_state, encoder_context);
     //gen75_vme_vme_state_setup(ctx, encode_state, is_intra, encoder_context);
-    gen75_vme_constant_setup(ctx, encode_state, encoder_context);
+    gen75_vme_constant_setup(ctx, encode_state, encoder_context, (pSliceParameter->slice_type == SLICE_TYPE_B) ? 2 : 1);
 
     /*Programing media pipeline*/
     gen75_vme_pipeline_programing(ctx, encode_state, encoder_context);
@@ -806,7 +686,7 @@ static VAStatus gen75_vme_prepare(VADriverContextP ctx,
     return vaStatus;
 }
 
-static VAStatus gen75_vme_run(VADriverContextP ctx, 
+static VAStatus gen75_vme_run(VADriverContextP ctx,
                               struct encode_state *encode_state,
                               struct intel_encoder_context *encoder_context)
 {
@@ -817,7 +697,7 @@ static VAStatus gen75_vme_run(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
-static VAStatus gen75_vme_stop(VADriverContextP ctx, 
+static VAStatus gen75_vme_stop(VADriverContextP ctx,
                                struct encode_state *encode_state,
                                struct intel_encoder_context *encoder_context)
 {
@@ -865,7 +745,7 @@ gen75_vme_mpeg2_output_buffer_setup(VADriverContextP ctx,
      * 16 * (2 + 2 * (1 + 8 + 2))= 16 * 24.
      */
 
-    vme_context->vme_output.bo = dri_bo_alloc(i965->intel.bufmgr, 
+    vme_context->vme_output.bo = dri_bo_alloc(i965->intel.bufmgr,
                                               "VME output buffer",
                                               vme_context->vme_output.num_blocks * vme_context->vme_output.size_block,
                                               0x1000);
@@ -893,7 +773,7 @@ gen75_vme_mpeg2_output_vme_batchbuffer_setup(VADriverContextP ctx,
     vme_context->vme_batchbuffer.num_blocks = width_in_mbs * height_in_mbs + 1;
     vme_context->vme_batchbuffer.size_block = 64; /* 4 OWORDs */
     vme_context->vme_batchbuffer.pitch = 16;
-    vme_context->vme_batchbuffer.bo = dri_bo_alloc(i965->intel.bufmgr, 
+    vme_context->vme_batchbuffer.bo = dri_bo_alloc(i965->intel.bufmgr,
                                                    "VME batchbuffer",
                                                    vme_context->vme_batchbuffer.num_blocks * vme_context->vme_batchbuffer.size_block,
                                                    0x1000);
@@ -905,33 +785,29 @@ gen75_vme_mpeg2_output_vme_batchbuffer_setup(VADriverContextP ctx,
 }
 
 static VAStatus
-gen75_vme_mpeg2_surface_setup(VADriverContextP ctx, 
+gen75_vme_mpeg2_surface_setup(VADriverContextP ctx,
                               struct encode_state *encode_state,
                               int is_intra,
                               struct intel_encoder_context *encoder_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct object_surface *obj_surface;
-    VAEncPictureParameterBufferMPEG2 *pic_param = (VAEncPictureParameterBufferMPEG2 *)encode_state->pic_param_ext->buffer;
 
     /*Setup surfaces state*/
     /* current picture for encoding */
-    obj_surface = SURFACE(encoder_context->input_yuv_surface);
-    assert(obj_surface);
+    obj_surface = encode_state->input_yuv_object;
     gen75_vme_source_surface_state(ctx, 0, obj_surface, encoder_context);
     gen75_vme_media_source_surface_state(ctx, 4, obj_surface, encoder_context);
     gen75_vme_media_chroma_source_surface_state(ctx, 6, obj_surface, encoder_context);
 
     if (!is_intra) {
         /* reference 0 */
-        obj_surface = SURFACE(pic_param->forward_reference_picture);
-        assert(obj_surface);
-        if ( obj_surface->bo != NULL)
+        obj_surface = encode_state->reference_objects[0];
+        if (obj_surface->bo != NULL)
             gen75_vme_source_surface_state(ctx, 1, obj_surface, encoder_context);
 
         /* reference 1 */
-        obj_surface = SURFACE(pic_param->backward_reference_picture);
-        if (obj_surface && obj_surface->bo != NULL) 
+        obj_surface = encode_state->reference_objects[1];
+        if (obj_surface && obj_surface->bo != NULL)
             gen75_vme_source_surface_state(ctx, 2, obj_surface, encoder_context);
     }
 
@@ -943,7 +819,7 @@ gen75_vme_mpeg2_surface_setup(VADriverContextP ctx,
 }
 
 static void
-gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx, 
+gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
                                      struct encode_state *encode_state,
                                      int mb_width, int mb_height,
                                      int kernel,
@@ -969,7 +845,7 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
             int slice_mb_x = slice_param->macroblock_address % mb_width;
 
             for (i = 0; i < slice_mb_number;) {
-                int mb_count = i + slice_mb_begin;    
+                int mb_count = i + slice_mb_begin;
 
                 mb_x = mb_count % mb_width;
                 mb_y = mb_count / mb_width;
@@ -985,7 +861,7 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
                     if (mb_x != 0)
                         mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_D;
 
-                    if (mb_x != (mb_width -1))
+                    if (mb_x != (mb_width - 1))
                         mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
                 }
 
@@ -999,7 +875,7 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
                         mb_intra_ub |= INTRA_PRED_AVAIL_FLAG_C;
                     }
                 }
-               
+
                 if ((i == mb_width) && slice_mb_x) {
                     mb_intra_ub &= ~(INTRA_PRED_AVAIL_FLAG_D);
                 }
@@ -1010,10 +886,10 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
                 *command_ptr++ = 0;
                 *command_ptr++ = 0;
                 *command_ptr++ = 0;
-   
+
                 /*inline data */
                 *command_ptr++ = (mb_width << 16 | mb_y << 8 | mb_x);
-                *command_ptr++ = ( (1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
+                *command_ptr++ = ((1 << 16) | transform_8x8_mode_flag | (mb_intra_ub << 8));
 
                 i += 1;
             }
@@ -1029,50 +905,92 @@ gen75_vme_mpeg2_fill_vme_batchbuffer(VADriverContextP ctx,
 }
 
 static void
-gen75_vme_mpeg2_pipeline_programing(VADriverContextP ctx, 
+gen75_vme_mpeg2_pipeline_programing(VADriverContextP ctx,
                                     struct encode_state *encode_state,
                                     int is_intra,
                                     struct intel_encoder_context *encoder_context)
 {
     struct gen6_vme_context *vme_context = encoder_context->vme_context;
     struct intel_batchbuffer *batch = encoder_context->base.batch;
+    VAEncPictureParameterBufferMPEG2 *pic_param = NULL;
     VAEncSequenceParameterBufferMPEG2 *seq_param = (VAEncSequenceParameterBufferMPEG2 *)encode_state->seq_param_ext->buffer;
     int width_in_mbs = ALIGN(seq_param->picture_width, 16) / 16;
     int height_in_mbs = ALIGN(seq_param->picture_height, 16) / 16;
+    bool allow_hwscore = true;
+    int s;
+    int kernel_shader;
 
-    gen75_vme_mpeg2_fill_vme_batchbuffer(ctx, 
-                                         encode_state,
-                                         width_in_mbs, height_in_mbs,
-                                         is_intra ? VME_INTRA_SHADER : VME_INTER_SHADER,
-                                         0,
-                                         encoder_context);
+    pic_param = (VAEncPictureParameterBufferMPEG2 *)encode_state->pic_param_ext->buffer;
+
+    for (s = 0; s < encode_state->num_slice_params_ext; s++) {
+        int j;
+        VAEncSliceParameterBufferMPEG2 *slice_param = (VAEncSliceParameterBufferMPEG2 *)encode_state->slice_params_ext[s]->buffer;
+
+        for (j = 0; j < encode_state->slice_params_ext[s]->num_elements; j++) {
+            if (slice_param->macroblock_address % width_in_mbs) {
+                allow_hwscore = false;
+                break;
+            }
+        }
+    }
+
+    pic_param = (VAEncPictureParameterBufferMPEG2 *)encode_state->pic_param_ext->buffer;
+    if (pic_param->picture_type == VAEncPictureTypeIntra) {
+        allow_hwscore = false;
+        kernel_shader = VME_INTRA_SHADER;
+    } else {
+        kernel_shader = VME_INTER_SHADER;
+    }
+
+    if (allow_hwscore)
+        gen7_vme_mpeg2_walker_fill_vme_batchbuffer(ctx,
+                                                   encode_state,
+                                                   width_in_mbs, height_in_mbs,
+                                                   kernel_shader,
+                                                   encoder_context);
+    else
+        gen75_vme_mpeg2_fill_vme_batchbuffer(ctx,
+                                             encode_state,
+                                             width_in_mbs, height_in_mbs,
+                                             kernel_shader,
+                                             0,
+                                             encoder_context);
 
     intel_batchbuffer_start_atomic(batch, 0x1000);
     gen6_gpe_pipeline_setup(ctx, &vme_context->gpe_context, batch);
     BEGIN_BATCH(batch, 2);
-    OUT_BATCH(batch, MI_BATCH_BUFFER_START | (2 << 6));
+    OUT_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8));
     OUT_RELOC(batch,
               vme_context->vme_batchbuffer.bo,
-              I915_GEM_DOMAIN_COMMAND, 0, 
+              I915_GEM_DOMAIN_COMMAND, 0,
               0);
     ADVANCE_BATCH(batch);
 
-    intel_batchbuffer_end_atomic(batch);       
+    intel_batchbuffer_end_atomic(batch);
 }
 
-static VAStatus 
-gen75_vme_mpeg2_prepare(VADriverContextP ctx, 
+static VAStatus
+gen75_vme_mpeg2_prepare(VADriverContextP ctx,
                         struct encode_state *encode_state,
                         struct intel_encoder_context *encoder_context)
 {
     VAStatus vaStatus = VA_STATUS_SUCCESS;
     VAEncSliceParameterBufferMPEG2 *slice_param = (VAEncSliceParameterBufferMPEG2 *)encode_state->slice_params_ext[0]->buffer;
-       
+
+    VAEncSequenceParameterBufferMPEG2 *seq_param = (VAEncSequenceParameterBufferMPEG2 *)encode_state->seq_param_ext->buffer;
+    struct gen6_vme_context *vme_context = encoder_context->vme_context;
+
+    if ((!vme_context->mpeg2_level) ||
+        (vme_context->mpeg2_level != (seq_param->sequence_extension.bits.profile_and_level_indication & MPEG2_LEVEL_MASK))) {
+        vme_context->mpeg2_level = seq_param->sequence_extension.bits.profile_and_level_indication & MPEG2_LEVEL_MASK;
+    }
+
     /*Setup all the memory object*/
     gen75_vme_mpeg2_surface_setup(ctx, encode_state, slice_param->is_intra_slice, encoder_context);
     gen75_vme_interface_setup(ctx, encode_state, encoder_context);
     gen75_vme_vme_state_setup(ctx, encode_state, slice_param->is_intra_slice, encoder_context);
-    gen75_vme_constant_setup(ctx, encode_state, encoder_context);
+    intel_vme_mpeg2_state_setup(ctx, encode_state, encoder_context);
+    gen75_vme_constant_setup(ctx, encode_state, encoder_context, 1);
 
     /*Programing media pipeline*/
     gen75_vme_mpeg2_pipeline_programing(ctx, encode_state, slice_param->is_intra_slice, encoder_context);
@@ -1110,10 +1028,20 @@ gen75_vme_context_destroy(void *context)
     dri_bo_unreference(vme_context->vme_batchbuffer.bo);
     vme_context->vme_batchbuffer.bo = NULL;
 
-    if (vme_context->vme_state_message) {
-       free(vme_context->vme_state_message);
-       vme_context->vme_state_message = NULL;
-    }
+    free(vme_context->vme_state_message);
+    vme_context->vme_state_message = NULL;
+
+    dri_bo_unreference(vme_context->i_qp_cost_table);
+    vme_context->i_qp_cost_table = NULL;
+
+    dri_bo_unreference(vme_context->p_qp_cost_table);
+    vme_context->p_qp_cost_table = NULL;
+
+    dri_bo_unreference(vme_context->b_qp_cost_table);
+    vme_context->b_qp_cost_table = NULL;
+
+    free(vme_context->qp_per_mb);
+    vme_context->qp_per_mb = NULL;
 
     free(vme_context);
 }
@@ -1122,20 +1050,20 @@ 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:
-    case VAProfileH264Main:
-    case VAProfileH264High:
+    switch (encoder_context->codec) {
+    case CODEC_H264:
+    case CODEC_H264_MVC:
         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:
+    case CODEC_MPEG2:
         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;
 
@@ -1146,6 +1074,8 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
         break;
     }
 
+    assert(vme_context);
+    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;
@@ -1154,34 +1084,17 @@ Bool gen75_vme_context_init(VADriverContextP ctx, struct intel_encoder_context *
     vme_context->gpe_context.curbe.length = CURBE_TOTAL_DATA_LENGTH;
 
     vme_context->gpe_context.vfe_state.max_num_threads = 60 - 1;
-    vme_context->gpe_context.vfe_state.num_urb_entries = 16;
+    vme_context->gpe_context.vfe_state.num_urb_entries = 64;
     vme_context->gpe_context.vfe_state.gpgpu_mode = 0;
-    vme_context->gpe_context.vfe_state.urb_entry_size = 59 - 1;
+    vme_context->gpe_context.vfe_state.urb_entry_size = 16;
     vme_context->gpe_context.vfe_state.curbe_allocation_size = CURBE_ALLOCATION_SIZE - 1;
 
-       vme_context->gpe_context.vfe_desc5.scoreboard0.enable = 1;
-       vme_context->gpe_context.vfe_desc5.scoreboard0.type = SCOREBOARD_STALLING;
-       vme_context->gpe_context.vfe_desc5.scoreboard0.mask = (MB_SCOREBOARD_A |
-                                                               MB_SCOREBOARD_B |
-                                                               MB_SCOREBOARD_C);
-
-       /* In VME prediction the current mb depends on the neighbour 
-        * A/B/C macroblock. So the left/up/up-right dependency should
-        * be considered.
-        */
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x0 = -1;
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y0 = 0;
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x1 = 0;
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y1 = -1;
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_x2 = 1;
-       vme_context->gpe_context.vfe_desc6.scoreboard1.delta_y2 = -1;
-       
-       vme_context->gpe_context.vfe_desc7.dword = 0;
+    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;