MPEG2 ENC: Remove gen9 pak pipeline code

SKL pak pipeline of mpeg2 encoding is same as gen8,
so remove the redundant code

Signed-off-by: Zhong Li <zhong.li@intel.com>
(cherry picked from commit ac46de469dd5eeaed34be0510631228a07748ec3)

1 files changed, 3 insertions, 746 deletions

diff --git a/src/gen9_mfc.c b/src/gen9_mfc.c
index ccbc6c2d..b328f75c 100644
--- a/src/gen9_mfc.c
+++ b/src/gen9_mfc.c
@@ -1620,742 +1620,6 @@ gen9_mfc_avc_encode_picture(VADriverContextP ctx,
     return VA_STATUS_SUCCESS;
 }
 
-/*
- * MPEG-2
- */
-
-static const int
-va_to_gen9_mpeg2_picture_type[3] = {
-    1,  /* I */
-    2,  /* P */
-    3   /* B */
-};
-
-static void
-gen9_mfc_mpeg2_pic_state(VADriverContextP ctx,
-                         struct intel_encoder_context *encoder_context,
-                         struct encode_state *encode_state)
-{
-    struct intel_batchbuffer *batch = encoder_context->base.batch;
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-    VAEncPictureParameterBufferMPEG2 *pic_param;
-    int width_in_mbs = (mfc_context->surface_state.width + 15) / 16;
-    int height_in_mbs = (mfc_context->surface_state.height + 15) / 16;
-    VAEncSliceParameterBufferMPEG2 *slice_param = NULL;
-
-    assert(encode_state->pic_param_ext && encode_state->pic_param_ext->buffer);
-    pic_param = (VAEncPictureParameterBufferMPEG2 *)encode_state->pic_param_ext->buffer;
-    slice_param = (VAEncSliceParameterBufferMPEG2 *)encode_state->slice_params_ext[0]->buffer;
-
-    BEGIN_BCS_BATCH(batch, 13);
-    OUT_BCS_BATCH(batch, MFX_MPEG2_PIC_STATE | (13 - 2));
-    OUT_BCS_BATCH(batch,
-                  (pic_param->f_code[1][1] & 0xf) << 28 | /* f_code[1][1] */
-                  (pic_param->f_code[1][0] & 0xf) << 24 | /* f_code[1][0] */
-                  (pic_param->f_code[0][1] & 0xf) << 20 | /* f_code[0][1] */
-                  (pic_param->f_code[0][0] & 0xf) << 16 | /* f_code[0][0] */
-                  pic_param->picture_coding_extension.bits.intra_dc_precision << 14 |
-                  pic_param->picture_coding_extension.bits.picture_structure << 12 |
-                  pic_param->picture_coding_extension.bits.top_field_first << 11 |
-                  pic_param->picture_coding_extension.bits.frame_pred_frame_dct << 10 |
-                  pic_param->picture_coding_extension.bits.concealment_motion_vectors << 9 |
-                  pic_param->picture_coding_extension.bits.q_scale_type << 8 |
-                  pic_param->picture_coding_extension.bits.intra_vlc_format << 7 |
-                  pic_param->picture_coding_extension.bits.alternate_scan << 6);
-    OUT_BCS_BATCH(batch,
-                  0 << 14 |     /* LoadSlicePointerFlag, 0 means only loading bitstream pointer once */
-                  va_to_gen9_mpeg2_picture_type[pic_param->picture_type] << 9 |
-                  0);
-    OUT_BCS_BATCH(batch,
-                  1 << 31 |     /* slice concealment */
-                  (height_in_mbs - 1) << 16 |
-                  (width_in_mbs - 1));
-
-    if (slice_param && slice_param->quantiser_scale_code >= 14)
-	OUT_BCS_BATCH(batch, (3 << 1) | (1 << 4) | (5 << 8) | (1 << 12));
-    else
-	OUT_BCS_BATCH(batch, 0);
-
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch,
-                  0xFFF << 16 | /* InterMBMaxSize */
-                  0xFFF << 0 |  /* IntraMBMaxSize */
-                  0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    ADVANCE_BCS_BATCH(batch);
-}
-
-static void
-gen9_mfc_mpeg2_qm_state(VADriverContextP ctx, struct intel_encoder_context *encoder_context)
-{
-    unsigned char intra_qm[64] = {
-        8, 16, 19, 22, 26, 27, 29, 34,
-        16, 16, 22, 24, 27, 29, 34, 37,
-        19, 22, 26, 27, 29, 34, 34, 38,
-        22, 22, 26, 27, 29, 34, 37, 40,
-        22, 26, 27, 29, 32, 35, 40, 48,
-        26, 27, 29, 32, 35, 40, 48, 58,
-        26, 27, 29, 34, 38, 46, 56, 69,
-        27, 29, 35, 38, 46, 56, 69, 83
-    };
-
-    unsigned char non_intra_qm[64] = {
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16,
-        16, 16, 16, 16, 16, 16, 16, 16
-    };
-
-    gen9_mfc_qm_state(ctx, MFX_QM_MPEG_INTRA_QUANTIZER_MATRIX, (unsigned int *)intra_qm, 16, encoder_context);
-    gen9_mfc_qm_state(ctx, MFX_QM_MPEG_NON_INTRA_QUANTIZER_MATRIX, (unsigned int *)non_intra_qm, 16,encoder_context);
-}
-
-static void
-gen9_mfc_mpeg2_fqm_state(VADriverContextP ctx, struct intel_encoder_context *encoder_context)
-{
-    unsigned short intra_fqm[64] = {
-        65536/0x8, 65536/0x10, 65536/0x13, 65536/0x16, 65536/0x16, 65536/0x1a, 65536/0x1a, 65536/0x1b,
-        65536/0x10, 65536/0x10, 65536/0x16, 65536/0x16, 65536/0x1a, 65536/0x1b, 65536/0x1b, 65536/0x1d,
-        65536/0x13, 65536/0x16, 65536/0x1a, 65536/0x1a, 65536/0x1b, 65536/0x1d, 65536/0x1d, 65536/0x23,
-        65536/0x16, 65536/0x18, 65536/0x1b, 65536/0x1b, 65536/0x13, 65536/0x20, 65536/0x22, 65536/0x26,
-        65536/0x1a, 65536/0x1b, 65536/0x13, 65536/0x13, 65536/0x20, 65536/0x23, 65536/0x26, 65536/0x2e,
-        65536/0x1b, 65536/0x1d, 65536/0x22, 65536/0x22, 65536/0x23, 65536/0x28, 65536/0x2e, 65536/0x38,
-        65536/0x1d, 65536/0x22, 65536/0x22, 65536/0x25, 65536/0x28, 65536/0x30, 65536/0x38, 65536/0x45,
-        65536/0x22, 65536/0x25, 65536/0x26, 65536/0x28, 65536/0x30, 65536/0x3a, 65536/0x45, 65536/0x53,
-    };
-
-    unsigned short non_intra_fqm[64] = {
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-        0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000, 0x1000,
-    };
-
-    gen9_mfc_fqm_state(ctx, MFX_QM_MPEG_INTRA_QUANTIZER_MATRIX, (unsigned int *)intra_fqm, 32, encoder_context);
-    gen9_mfc_fqm_state(ctx, MFX_QM_MPEG_NON_INTRA_QUANTIZER_MATRIX, (unsigned int *)non_intra_fqm, 32, encoder_context);
-}
-
-static void
-gen9_mfc_mpeg2_slicegroup_state(VADriverContextP ctx,
-                                struct intel_encoder_context *encoder_context,
-                                int x, int y,
-                                int next_x, int next_y,
-                                int is_fisrt_slice_group,
-                                int is_last_slice_group,
-                                int intra_slice,
-                                int qp,
-                                struct intel_batchbuffer *batch)
-{
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-
-    if (batch == NULL)
-        batch = encoder_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 8);
-
-    OUT_BCS_BATCH(batch, MFC_MPEG2_SLICEGROUP_STATE | (8 - 2));
-    OUT_BCS_BATCH(batch,
-                  0 << 31 |                             /* MbRateCtrlFlag */
-                  !!is_last_slice_group << 19 |         /* IsLastSliceGrp */
-                  1 << 17 |                             /* Insert Header before the first slice group data */
-                  1 << 16 |                             /* SliceData PresentFlag: always 1 */
-                  1 << 15 |                             /* TailPresentFlag: always 1 */
-                  0 << 14 |                             /* FirstSliceHdrDisabled: slice header for each slice */
-                  !!intra_slice << 13 |                 /* IntraSlice */
-                  !!intra_slice << 12 |                 /* IntraSliceFlag */
-                  0);
-    OUT_BCS_BATCH(batch,
-                  next_y << 24 |
-                  next_x << 16 |
-                  y << 8 |
-                  x << 0 |
-                  0);
-    OUT_BCS_BATCH(batch, qp);   /* FIXME: SliceGroupQp */
-    /* bitstream pointer is only loaded once for the first slice of a frame when
-     * LoadSlicePointerFlag is 0
-     */
-    OUT_BCS_BATCH(batch, mfc_context->mfc_indirect_pak_bse_object.offset);
-    OUT_BCS_BATCH(batch, 0);    /* FIXME: */
-    OUT_BCS_BATCH(batch, 0);    /* FIXME: CorrectPoints */
-    OUT_BCS_BATCH(batch, 0);    /* FIXME: CVxxx */
-
-    ADVANCE_BCS_BATCH(batch);
-}
-
-static int
-gen9_mfc_mpeg2_pak_object_intra(VADriverContextP ctx,
-                                struct intel_encoder_context *encoder_context,
-                                int x, int y,
-                                int first_mb_in_slice,
-                                int last_mb_in_slice,
-                                int first_mb_in_slice_group,
-                                int last_mb_in_slice_group,
-                                int mb_type,
-                                int qp_scale_code,
-                                int coded_block_pattern,
-                                unsigned char target_size_in_word,
-                                unsigned char max_size_in_word,
-                                struct intel_batchbuffer *batch)
-{
-    int len_in_dwords = 9;
-
-    if (batch == NULL)
-        batch = encoder_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, len_in_dwords);
-
-    OUT_BCS_BATCH(batch, MFC_MPEG2_PAK_OBJECT | (len_in_dwords - 2));
-    OUT_BCS_BATCH(batch,
-                  0 << 24 |     /* PackedMvNum */
-                  0 << 20 |     /* MvFormat */
-                  7 << 17 |     /* CbpDcY/CbpDcU/CbpDcV */
-                  0 << 15 |     /* TransformFlag: frame DCT */
-                  0 << 14 |     /* FieldMbFlag */
-                  1 << 13 |     /* IntraMbFlag */
-                  mb_type << 8 |   /* MbType: Intra */
-                  0 << 2 |      /* SkipMbFlag */
-                  0 << 0 |      /* InterMbMode */
-                  0);
-    OUT_BCS_BATCH(batch, y << 16 | x);
-    OUT_BCS_BATCH(batch,
-                  max_size_in_word << 24 |
-                  target_size_in_word << 16 |
-                  coded_block_pattern << 6 |      /* CBP */
-                  0);
-    OUT_BCS_BATCH(batch,
-                  last_mb_in_slice << 31 |
-                  first_mb_in_slice << 30 |
-                  0 << 27 |     /* EnableCoeffClamp */
-                  last_mb_in_slice_group << 26 |
-                  0 << 25 |     /* MbSkipConvDisable */
-                  first_mb_in_slice_group << 24 |
-                  0 << 16 |     /* MvFieldSelect */
-                  qp_scale_code << 0 |
-                  0);
-    OUT_BCS_BATCH(batch, 0);    /* MV[0][0] */
-    OUT_BCS_BATCH(batch, 0);    /* MV[1][0] */
-    OUT_BCS_BATCH(batch, 0);    /* MV[0][1] */
-    OUT_BCS_BATCH(batch, 0);    /* MV[1][1] */
-
-    ADVANCE_BCS_BATCH(batch);
-
-    return len_in_dwords;
-}
-
-/* Byte offset */
-#define MPEG2_INTER_MV_OFFSET   48
-
-static struct _mv_ranges
-{
-    int low;    /* in the unit of 1/2 pixel */
-    int high;   /* in the unit of 1/2 pixel */
-} mv_ranges[] = {
-    {0, 0},
-    {-16, 15},
-    {-32, 31},
-    {-64, 63},
-    {-128, 127},
-    {-256, 255},
-    {-512, 511},
-    {-1024, 1023},
-    {-2048, 2047},
-    {-4096, 4095}
-};
-
-static int
-mpeg2_motion_vector(int mv, int pos, int display_max, int f_code)
-{
-    if (mv + pos * 16 * 2 < 0 ||
-        mv + (pos + 1) * 16 * 2 > display_max * 2)
-        mv = 0;
-
-    if (f_code > 0 && f_code < 10) {
-        if (mv < mv_ranges[f_code].low)
-            mv = mv_ranges[f_code].low;
-
-        if (mv > mv_ranges[f_code].high)
-            mv = mv_ranges[f_code].high;
-    }
-
-    return mv;
-}
-
-static int
-gen9_mfc_mpeg2_pak_object_inter(VADriverContextP ctx,
-                                struct encode_state *encode_state,
-                                struct intel_encoder_context *encoder_context,
-                                unsigned int *msg,
-                                int width_in_mbs, int height_in_mbs,
-                                int x, int y,
-                                int first_mb_in_slice,
-                                int last_mb_in_slice,
-                                int first_mb_in_slice_group,
-                                int last_mb_in_slice_group,
-                                int qp_scale_code,
-                                unsigned char target_size_in_word,
-                                unsigned char max_size_in_word,
-                                struct intel_batchbuffer *batch)
-{
-    VAEncPictureParameterBufferMPEG2 *pic_param = (VAEncPictureParameterBufferMPEG2 *)encode_state->pic_param_ext->buffer;
-    int len_in_dwords = 9;
-    short *mvptr, mvx0, mvy0, mvx1, mvy1;
-
-    if (batch == NULL)
-        batch = encoder_context->base.batch;
-
-    mvptr = (short *)((unsigned char *)msg + MPEG2_INTER_MV_OFFSET);;
-    mvx0 = mpeg2_motion_vector(mvptr[0] / 2, x, width_in_mbs * 16, pic_param->f_code[0][0]);
-    mvy0 = mpeg2_motion_vector(mvptr[1] / 2, y, height_in_mbs * 16, pic_param->f_code[0][0]);
-    mvx1 = mpeg2_motion_vector(mvptr[2] / 2, x, width_in_mbs * 16, pic_param->f_code[1][0]);
-    mvy1 = mpeg2_motion_vector(mvptr[3] / 2, y, height_in_mbs * 16, pic_param->f_code[1][0]);
-
-    BEGIN_BCS_BATCH(batch, len_in_dwords);
-
-    OUT_BCS_BATCH(batch, MFC_MPEG2_PAK_OBJECT | (len_in_dwords - 2));
-    OUT_BCS_BATCH(batch,
-                  2 << 24 |     /* PackedMvNum */
-                  7 << 20 |     /* MvFormat */
-                  7 << 17 |     /* CbpDcY/CbpDcU/CbpDcV */
-                  0 << 15 |     /* TransformFlag: frame DCT */
-                  0 << 14 |     /* FieldMbFlag */
-                  0 << 13 |     /* IntraMbFlag */
-                  1 << 8 |      /* MbType: Frame-based */
-                  0 << 2 |      /* SkipMbFlag */
-                  0 << 0 |      /* InterMbMode */
-                  0);
-    OUT_BCS_BATCH(batch, y << 16 | x);
-    OUT_BCS_BATCH(batch,
-                  max_size_in_word << 24 |
-                  target_size_in_word << 16 |
-                  0x3f << 6 |   /* CBP */
-                  0);
-    OUT_BCS_BATCH(batch,
-                  last_mb_in_slice << 31 |
-                  first_mb_in_slice << 30 |
-                  0 << 27 |     /* EnableCoeffClamp */
-                  last_mb_in_slice_group << 26 |
-                  0 << 25 |     /* MbSkipConvDisable */
-                  first_mb_in_slice_group << 24 |
-                  0 << 16 |     /* MvFieldSelect */
-                  qp_scale_code << 0 |
-                  0);
-
-    OUT_BCS_BATCH(batch, (mvx0 & 0xFFFF) | mvy0 << 16);    /* MV[0][0] */
-    OUT_BCS_BATCH(batch, (mvx1 & 0xFFFF) | mvy1 << 16);    /* MV[1][0] */
-    OUT_BCS_BATCH(batch, 0);    /* MV[0][1] */
-    OUT_BCS_BATCH(batch, 0);    /* MV[1][1] */
-
-    ADVANCE_BCS_BATCH(batch);
-
-    return len_in_dwords;
-}
-
-static void
-intel_mfc_mpeg2_pipeline_header_programing(VADriverContextP ctx,
-                                           struct encode_state *encode_state,
-                                           struct intel_encoder_context *encoder_context,
-                                           struct intel_batchbuffer *slice_batch)
-{
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-    int idx = va_enc_packed_type_to_idx(VAEncPackedHeaderMPEG2_SPS);
-
-    if (encode_state->packed_header_data[idx]) {
-        VAEncPackedHeaderParameterBuffer *param = NULL;
-        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[idx]->buffer;
-        unsigned int length_in_bits;
-
-        assert(encode_state->packed_header_param[idx]);
-        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[idx]->buffer;
-        length_in_bits = param->bit_length;
-
-        mfc_context->insert_object(ctx,
-                                   encoder_context,
-                                   header_data,
-                                   ALIGN(length_in_bits, 32) >> 5,
-                                   length_in_bits & 0x1f,
-                                   5,   /* FIXME: check it */
-                                   0,
-                                   0,
-                                   0,   /* Needn't insert emulation bytes for MPEG-2 */
-                                   slice_batch);
-    }
-
-    idx = va_enc_packed_type_to_idx(VAEncPackedHeaderMPEG2_PPS);
-
-    if (encode_state->packed_header_data[idx]) {
-        VAEncPackedHeaderParameterBuffer *param = NULL;
-        unsigned int *header_data = (unsigned int *)encode_state->packed_header_data[idx]->buffer;
-        unsigned int length_in_bits;
-
-        assert(encode_state->packed_header_param[idx]);
-        param = (VAEncPackedHeaderParameterBuffer *)encode_state->packed_header_param[idx]->buffer;
-        length_in_bits = param->bit_length;
-
-        mfc_context->insert_object(ctx,
-                                   encoder_context,
-                                   header_data,
-                                   ALIGN(length_in_bits, 32) >> 5,
-                                   length_in_bits & 0x1f,
-                                   5,   /* FIXME: check it */
-                                   0,
-                                   0,
-                                   0,   /* Needn't insert emulation bytes for MPEG-2 */
-                                   slice_batch);
-    }
-}
-
-static void
-gen9_mfc_mpeg2_pipeline_slice_group(VADriverContextP ctx,
-                                    struct encode_state *encode_state,
-                                    struct intel_encoder_context *encoder_context,
-                                    int slice_index,
-                                    VAEncSliceParameterBufferMPEG2 *next_slice_group_param,
-                                    struct intel_batchbuffer *slice_batch)
-{
-    struct gen6_vme_context *vme_context = encoder_context->vme_context;
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-    VAEncSequenceParameterBufferMPEG2 *seq_param = (VAEncSequenceParameterBufferMPEG2 *)encode_state->seq_param_ext->buffer;
-    VAEncSliceParameterBufferMPEG2 *slice_param = NULL;
-    unsigned char tail_delimiter[] = {MPEG2_DELIMITER0, MPEG2_DELIMITER1, MPEG2_DELIMITER2, MPEG2_DELIMITER3, MPEG2_DELIMITER4, 0, 0, 0};
-    unsigned char section_delimiter[] = {0x0, 0x0, 0x0, 0x0};
-    int width_in_mbs = ALIGN(seq_param->picture_width, 16) / 16;
-    int height_in_mbs = ALIGN(seq_param->picture_height, 16) / 16;
-    int i, j;
-    int h_start_pos, v_start_pos, h_next_start_pos, v_next_start_pos;
-    unsigned int *msg = NULL;
-    unsigned char *msg_ptr = NULL;
-
-    slice_param = (VAEncSliceParameterBufferMPEG2 *)encode_state->slice_params_ext[slice_index]->buffer;
-    h_start_pos = slice_param->macroblock_address % width_in_mbs;
-    v_start_pos = slice_param->macroblock_address / width_in_mbs;
-    assert(h_start_pos + slice_param->num_macroblocks <= width_in_mbs);
-
-    dri_bo_map(vme_context->vme_output.bo , 0);
-    msg_ptr = (unsigned char *)vme_context->vme_output.bo->virtual;
-
-    if (next_slice_group_param) {
-        h_next_start_pos = next_slice_group_param->macroblock_address % width_in_mbs;
-        v_next_start_pos = next_slice_group_param->macroblock_address / width_in_mbs;
-    } else {
-        h_next_start_pos = 0;
-        v_next_start_pos = height_in_mbs;
-    }
-
-    gen9_mfc_mpeg2_slicegroup_state(ctx,
-                                    encoder_context,
-                                    h_start_pos,
-                                    v_start_pos,
-                                    h_next_start_pos,
-                                    v_next_start_pos,
-                                    slice_index == 0,
-                                    next_slice_group_param == NULL,
-                                    slice_param->is_intra_slice,
-                                    slice_param->quantiser_scale_code,
-                                    slice_batch);
-
-    if (slice_index == 0)
-        intel_mfc_mpeg2_pipeline_header_programing(ctx, encode_state, encoder_context, slice_batch);
-
-    /* Insert '00' to make sure the header is valid */
-    mfc_context->insert_object(ctx,
-                               encoder_context,
-                               (unsigned int*)section_delimiter,
-                               1,
-                               8,   /* 8bits in the last DWORD */
-                               1,   /* 1 byte */
-                               1,
-                               0,
-                               0,
-                               slice_batch);
-
-    for (i = 0; i < encode_state->slice_params_ext[slice_index]->num_elements; i++) {
-        /* PAK for each macroblocks */
-        for (j = 0; j < slice_param->num_macroblocks; j++) {
-            int h_pos = (slice_param->macroblock_address + j) % width_in_mbs;
-            int v_pos = (slice_param->macroblock_address + j) / width_in_mbs;
-            int first_mb_in_slice = (j == 0);
-            int last_mb_in_slice = (j == slice_param->num_macroblocks - 1);
-            int first_mb_in_slice_group = (i == 0 && j == 0);
-            int last_mb_in_slice_group = (i == encode_state->slice_params_ext[slice_index]->num_elements - 1 &&
-                                          j == slice_param->num_macroblocks - 1);
-
-            msg = (unsigned int *)(msg_ptr + (slice_param->macroblock_address + j) * vme_context->vme_output.size_block);
-
-            if (slice_param->is_intra_slice) {
-                gen9_mfc_mpeg2_pak_object_intra(ctx,
-                                                encoder_context,
-                                                h_pos, v_pos,
-                                                first_mb_in_slice,
-                                                last_mb_in_slice,
-                                                first_mb_in_slice_group,
-                                                last_mb_in_slice_group,
-                                                0x1a,
-                                                slice_param->quantiser_scale_code,
-                                                0x3f,
-                                                0,
-                                                0xff,
-                                                slice_batch);
-            } else {
-		int inter_rdo, intra_rdo;
-		inter_rdo = msg[AVC_INTER_RDO_OFFSET] & AVC_RDO_MASK;
-		intra_rdo = msg[AVC_INTRA_RDO_OFFSET] & AVC_RDO_MASK;
-
-		if (intra_rdo < inter_rdo)
-                    gen9_mfc_mpeg2_pak_object_intra(ctx,
-                                                     encoder_context,
-                                                     h_pos, v_pos,
-                                                     first_mb_in_slice,
-                                                     last_mb_in_slice,
-                                                     first_mb_in_slice_group,
-                                                     last_mb_in_slice_group,
-                                                     0x1a,
-                                                     slice_param->quantiser_scale_code,
-                                                     0x3f,
-                                                     0,
-                                                     0xff,
-                                                     slice_batch);
-		else
-                    gen9_mfc_mpeg2_pak_object_inter(ctx,
-                                                encode_state,
-                                                encoder_context,
-                                                msg,
-                                                width_in_mbs, height_in_mbs,
-                                                h_pos, v_pos,
-                                                first_mb_in_slice,
-                                                last_mb_in_slice,
-                                                first_mb_in_slice_group,
-                                                last_mb_in_slice_group,
-                                                slice_param->quantiser_scale_code,
-                                                0,
-                                                0xff,
-                                                slice_batch);
-            }
-        }
-
-        slice_param++;
-    }
-
-    dri_bo_unmap(vme_context->vme_output.bo);
-
-    /* tail data */
-    if (next_slice_group_param == NULL) { /* end of a picture */
-        mfc_context->insert_object(ctx,
-                                   encoder_context,
-                                   (unsigned int *)tail_delimiter,
-                                   2,
-                                   8,   /* 8bits in the last DWORD */
-                                   5,   /* 5 bytes */
-                                   1,
-                                   1,
-                                   0,
-                                   slice_batch);
-    } else {        /* end of a lsice group */
-        mfc_context->insert_object(ctx,
-                                   encoder_context,
-                                   (unsigned int *)section_delimiter,
-                                   1,
-                                   8,   /* 8bits in the last DWORD */
-                                   1,   /* 1 byte */
-                                   1,
-                                   1,
-                                   0,
-                                   slice_batch);
-    }
-}
-
-/*
- * A batch buffer for all slices, including slice state
- * slice insert object and slice pak object commands
- */
-static dri_bo *
-gen9_mfc_mpeg2_software_slice_batchbuffer(VADriverContextP ctx,
-                                          struct encode_state *encode_state,
-                                          struct intel_encoder_context *encoder_context)
-{
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-    struct intel_batchbuffer *batch;
-    VAEncSliceParameterBufferMPEG2 *next_slice_group_param = NULL;
-    dri_bo *batch_bo;
-    int i;
-
-    batch = mfc_context->aux_batchbuffer;
-    batch_bo = batch->buffer;
-
-    for (i = 0; i < encode_state->num_slice_params_ext; i++) {
-        if (i == encode_state->num_slice_params_ext - 1)
-            next_slice_group_param = NULL;
-        else
-            next_slice_group_param = (VAEncSliceParameterBufferMPEG2 *)encode_state->slice_params_ext[i + 1]->buffer;
-
-        gen9_mfc_mpeg2_pipeline_slice_group(ctx, encode_state, encoder_context, i, next_slice_group_param, batch);
-    }
-
-    intel_batchbuffer_align(batch, 8);
-
-    BEGIN_BCS_BATCH(batch, 2);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, MI_BATCH_BUFFER_END);
-    ADVANCE_BCS_BATCH(batch);
-
-    dri_bo_reference(batch_bo);
-    intel_batchbuffer_free(batch);
-    mfc_context->aux_batchbuffer = NULL;
-
-    return batch_bo;
-}
-
-static void
-gen9_mfc_mpeg2_pipeline_picture_programing(VADriverContextP ctx,
-                                           struct encode_state *encode_state,
-                                           struct intel_encoder_context *encoder_context)
-{
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-
-    mfc_context->pipe_mode_select(ctx, MFX_FORMAT_MPEG2, encoder_context);
-    mfc_context->set_surface_state(ctx, encoder_context);
-    mfc_context->ind_obj_base_addr_state(ctx, encoder_context);
-    gen9_mfc_pipe_buf_addr_state(ctx, encoder_context);
-    gen9_mfc_bsp_buf_base_addr_state(ctx, encoder_context);
-    gen9_mfc_mpeg2_pic_state(ctx, encoder_context, encode_state);
-    gen9_mfc_mpeg2_qm_state(ctx, encoder_context);
-    gen9_mfc_mpeg2_fqm_state(ctx, encoder_context);
-}
-
-static void
-gen9_mfc_mpeg2_pipeline_programing(VADriverContextP ctx,
-                                   struct encode_state *encode_state,
-                                   struct intel_encoder_context *encoder_context)
-{
-    struct intel_batchbuffer *batch = encoder_context->base.batch;
-    dri_bo *slice_batch_bo;
-
-    slice_batch_bo = gen9_mfc_mpeg2_software_slice_batchbuffer(ctx, encode_state, encoder_context);
-
-    // begin programing
-    intel_batchbuffer_start_atomic_bcs(batch, 0x4000);
-    intel_batchbuffer_emit_mi_flush(batch);
-
-    // picture level programing
-    gen9_mfc_mpeg2_pipeline_picture_programing(ctx, encode_state, encoder_context);
-
-    BEGIN_BCS_BATCH(batch, 4);
-    OUT_BCS_BATCH(batch, MI_BATCH_BUFFER_START | (1 << 8) | (1 << 0));
-    OUT_BCS_RELOC(batch,
-                  slice_batch_bo,
-                  I915_GEM_DOMAIN_COMMAND, 0,
-                  0);
-    OUT_BCS_BATCH(batch, 0);
-    OUT_BCS_BATCH(batch, 0);
-    ADVANCE_BCS_BATCH(batch);
-
-    // end programing
-    intel_batchbuffer_end_atomic(batch);
-
-    dri_bo_unreference(slice_batch_bo);
-}
-
-static VAStatus
-intel_mfc_mpeg2_prepare(VADriverContextP ctx,
-                        struct encode_state *encode_state,
-                        struct intel_encoder_context *encoder_context)
-{
-    struct gen6_mfc_context *mfc_context = encoder_context->mfc_context;
-    struct object_surface *obj_surface;
-    struct object_buffer *obj_buffer;
-    struct i965_coded_buffer_segment *coded_buffer_segment;
-    VAStatus vaStatus = VA_STATUS_SUCCESS;
-    dri_bo *bo;
-    int i;
-
-    /* reconstructed surface */
-    obj_surface = encode_state->reconstructed_object;
-    i965_check_alloc_surface_bo(ctx, obj_surface, 1, VA_FOURCC('N','V','1','2'), SUBSAMPLE_YUV420);
-    mfc_context->pre_deblocking_output.bo = obj_surface->bo;
-    dri_bo_reference(mfc_context->pre_deblocking_output.bo);
-    mfc_context->surface_state.width = obj_surface->orig_width;
-    mfc_context->surface_state.height = obj_surface->orig_height;
-    mfc_context->surface_state.w_pitch = obj_surface->width;
-    mfc_context->surface_state.h_pitch = obj_surface->height;
-
-    /* forward reference */
-    obj_surface = encode_state->reference_objects[0];
-
-    if (obj_surface && obj_surface->bo) {
-        mfc_context->reference_surfaces[0].bo = obj_surface->bo;
-        dri_bo_reference(mfc_context->reference_surfaces[0].bo);
-    } else
-        mfc_context->reference_surfaces[0].bo = NULL;
-
-    /* backward reference */
-    obj_surface = encode_state->reference_objects[1];
-
-    if (obj_surface && obj_surface->bo) {
-        mfc_context->reference_surfaces[1].bo = obj_surface->bo;
-        dri_bo_reference(mfc_context->reference_surfaces[1].bo);
-    } else {
-        mfc_context->reference_surfaces[1].bo = mfc_context->reference_surfaces[0].bo;
-
-        if (mfc_context->reference_surfaces[1].bo)
-            dri_bo_reference(mfc_context->reference_surfaces[1].bo);
-    }
-
-    for (i = 2; i < ARRAY_ELEMS(mfc_context->reference_surfaces); i++) {
-        mfc_context->reference_surfaces[i].bo = mfc_context->reference_surfaces[i & 1].bo;
-
-        if (mfc_context->reference_surfaces[i].bo)
-            dri_bo_reference(mfc_context->reference_surfaces[i].bo);
-    }
-
-    /* input YUV surface */
-    obj_surface = encode_state->input_yuv_object;
-    mfc_context->uncompressed_picture_source.bo = obj_surface->bo;
-    dri_bo_reference(mfc_context->uncompressed_picture_source.bo);
-
-    /* coded buffer */
-    obj_buffer = encode_state->coded_buf_object;
-    bo = obj_buffer->buffer_store->bo;
-    mfc_context->mfc_indirect_pak_bse_object.bo = bo;
-    mfc_context->mfc_indirect_pak_bse_object.offset = I965_CODEDBUFFER_HEADER_SIZE;
-    mfc_context->mfc_indirect_pak_bse_object.end_offset = ALIGN(obj_buffer->size_element - 0x1000, 0x1000);
-    dri_bo_reference(mfc_context->mfc_indirect_pak_bse_object.bo);
-
-    /* set the internal flag to 0 to indicate the coded size is unknown */
-    dri_bo_map(bo, 1);
-    coded_buffer_segment = (struct i965_coded_buffer_segment *)bo->virtual;
-    coded_buffer_segment->mapped = 0;
-    coded_buffer_segment->codec = encoder_context->codec;
-    dri_bo_unmap(bo);
-
-    return vaStatus;
-}
-
-static VAStatus
-gen9_mfc_mpeg2_encode_picture(VADriverContextP ctx,
-                              struct encode_state *encode_state,
-                              struct intel_encoder_context *encoder_context)
-{
-    gen9_mfc_init(ctx, encode_state, encoder_context);
-    intel_mfc_mpeg2_prepare(ctx, encode_state, encoder_context);
-    /*Programing bcs pipeline*/
-    gen9_mfc_mpeg2_pipeline_programing(ctx, encode_state, encoder_context);
-    gen9_mfc_run(ctx, encode_state, encoder_context);
-
-    return VA_STATUS_SUCCESS;
-}
-
 static void
 gen9_mfc_context_destroy(void *context)
 {
@@ -2429,12 +1693,6 @@ static VAStatus gen9_mfc_pipeline(VADriverContextP ctx,
         vaStatus = gen9_mfc_avc_encode_picture(ctx, encode_state, encoder_context);
         break;
 
-        /* FIXME: add for other profile */
-    case VAProfileMPEG2Simple:
-    case VAProfileMPEG2Main:
-        vaStatus = gen9_mfc_mpeg2_encode_picture(ctx, encode_state, encoder_context);
-        break;
-
     default:
         vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
         break;
@@ -2449,14 +1707,13 @@ Bool gen9_mfc_context_init(VADriverContextP ctx, struct intel_encoder_context *e
 
 #if MFC_SOFTWARE_HASWELL
     if ((encoder_context->codec == CODEC_H264) ||
-        (encoder_context->codec == CODEC_H264_MVC) ||
-        (encoder_context->codec == CODEC_MPEG2)) {
-
+        (encoder_context->codec == CODEC_H264_MVC)) {
         return gen8_mfc_context_init(ctx, encoder_context);
     }
 #endif
 
-    if (encoder_context->codec == CODEC_VP8) 
+    if ((encoder_context->codec == CODEC_VP8) ||
+        (encoder_context->codec == CODEC_MPEG2))
         return gen8_mfc_context_init(ctx, encoder_context);
 
     mfc_context = calloc(1, sizeof(struct gen6_mfc_context));