Warning fixes

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/src/gen6_mfc.c b/src/gen6_mfc.c
index 72405de..a479f80 100644 (file)
--- a/src/gen6_mfc.c
+++ b/src/gen6_mfc.c
@@ -420,46 +420,6 @@ gen7_mfc_avc_img_state(VADriverContextP ctx,
     ADVANCE_BCS_BATCH(batch);
 }
 
-static void gen6_mfc_avc_directmode_state(VADriverContextP ctx,
-                                          struct gen6_encoder_context *gen6_encoder_context,
-                                          struct intel_batchbuffer *batch)
-{
-    int i;
-
-    if (batch == NULL)
-        batch = gen6_encoder_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 69);
-
-    OUT_BCS_BATCH(batch, MFX_AVC_DIRECTMODE_STATE | (69 - 2));
-    //TODO: reference DMV
-    for(i = 0; i < 16; i++){
-        OUT_BCS_BATCH(batch, 0);
-        OUT_BCS_BATCH(batch, 0);
-    }
-
-    //TODO: current DMV just for test
-#if 0
-    OUT_BCS_RELOC(batch, mfc_context->direct_mv_buffers[0].bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  0);
-#else
-    //drm_intel_bo_pin(mfc_context->direct_mv_buffers[0].bo, 0x1000);
-    //OUT_BCS_BATCH(batch, mfc_context->direct_mv_buffers[0].bo->offset);
-    OUT_BCS_BATCH(batch, 0);
-#endif
-
-
-    OUT_BCS_BATCH(batch, 0);
-
-    //TODO: POL list
-    for(i = 0; i < 34; i++) {
-        OUT_BCS_BATCH(batch, 0);
-    }
-
-    ADVANCE_BCS_BATCH(batch);
-}
-
 static void gen6_mfc_avc_slice_state(VADriverContextP ctx,
                                      int intra_slice,
                                      struct gen6_encoder_context *gen6_encoder_context,
@@ -659,28 +619,6 @@ static void gen6_mfc_avc_ref_idx_state(VADriverContextP ctx,
     ADVANCE_BCS_BATCH(batch);
 }
        
-static void
-gen6_mfc_avc_insert_object(VADriverContextP ctx, int flush_data, 
-                           struct gen6_encoder_context *gen6_encoder_context,
-                           struct intel_batchbuffer *batch)
-{
-    if (batch == NULL)
-        batch = gen6_encoder_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 4);
-
-    OUT_BCS_BATCH(batch, MFC_AVC_INSERT_OBJECT | (4 -2 ) );
-    OUT_BCS_BATCH(batch, (32<<8) | 
-                  (1 << 3) |
-                  (1 << 2) |
-                  (flush_data << 1) |
-                  (1<<0) );
-    OUT_BCS_BATCH(batch, 0x00000003);
-    OUT_BCS_BATCH(batch, 0xABCD1234);
-
-    ADVANCE_BCS_BATCH(batch);
-}
-
 static int
 gen6_mfc_avc_pak_object_intra(VADriverContextP ctx, int x, int y, int end_mb, int qp,unsigned int *msg,
                               struct gen6_encoder_context *gen6_encoder_context,
@@ -778,7 +716,6 @@ static void gen6_mfc_init(VADriverContextP ctx,
     int i;
     VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param->buffer;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
-    int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
 
     /*Encode common setup for MFC*/
     dri_bo_unreference(mfc_context->post_deblocking_output.bo);

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index 6174d84..9c110c6 100755 (executable)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -395,27 +395,6 @@ gen6_mfd_bsp_buf_base_addr_state(VADriverContextP ctx,
 }
 
 static void
-gen6_mfd_aes_state(VADriverContextP ctx,
-                   struct decode_state *decode_state,
-                   int standard_select)
-{
-    /* FIXME */
-}
-
-static void
-gen6_mfd_wait(VADriverContextP ctx,
-              struct decode_state *decode_state,
-              int standard_select,
-              struct gen6_mfd_context *gen6_mfd_context)
-{
-    struct intel_batchbuffer *batch = gen6_mfd_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 1);
-    OUT_BCS_BATCH(batch, MFX_WAIT | (1 << 8));
-    ADVANCE_BCS_BATCH(batch);
-}
-
-static void
 gen6_mfd_avc_img_state(VADriverContextP ctx,
                        struct decode_state *decode_state,
                        struct gen6_mfd_context *gen6_mfd_context)

diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index c7a5e11..9fe8cd9 100644 (file)
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -627,11 +627,9 @@ static VAStatus gen6_vme_constant_setup(VADriverContextP ctx,
                                         struct gen6_encoder_context *gen6_encoder_context)
 {
     struct gen6_vme_context *vme_context = &gen6_encoder_context->vme_context;
-    unsigned char *constant_buffer;
 
     dri_bo_map(vme_context->curbe.bo, 1);
     assert(vme_context->curbe.bo->virtual);
-    constant_buffer = vme_context->curbe.bo->virtual;
        
     /*TODO copy buffer into CURB*/
 

diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c
index 581a986..0f2c62e 100644 (file)
--- a/src/gen75_mfc.c
+++ b/src/gen75_mfc.c
@@ -746,28 +746,6 @@ static void gen75_mfc_avc_ref_idx_state(VADriverContextP ctx,
     ADVANCE_BCS_BATCH(batch);
 }
        
-static void
-gen75_mfc_avc_insert_object(VADriverContextP ctx, int flush_data,
-                            struct gen6_encoder_context *gen6_encoder_context,
-                            struct intel_batchbuffer *batch)
-{
-    if (batch == NULL)
-        batch = gen6_encoder_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 4);
-
-    OUT_BCS_BATCH(batch, MFC_AVC_INSERT_OBJECT | (4 -2 ) );
-    OUT_BCS_BATCH(batch, (32<<8) | 
-                  (1 << 3) |
-                  (1 << 2) |
-                  (flush_data << 1) |
-                  (1<<0) );
-    OUT_BCS_BATCH(batch, 0x00000003);
-    OUT_BCS_BATCH(batch, 0xABCD1234);
-
-    ADVANCE_BCS_BATCH(batch);
-}
-
 static int
 gen75_mfc_avc_pak_object_intra(VADriverContextP ctx, int x, int y, int end_mb, int qp,unsigned int *msg,
                                struct gen6_encoder_context *gen6_encoder_context,
@@ -876,7 +854,6 @@ static void gen75_mfc_init(VADriverContextP ctx,
     int i;
     VAEncSequenceParameterBufferH264 *pSequenceParameter = (VAEncSequenceParameterBufferH264 *)encode_state->seq_param->buffer;
     int width_in_mbs = pSequenceParameter->picture_width_in_mbs;
-    int height_in_mbs = pSequenceParameter->picture_height_in_mbs;
 
     /*Encode common setup for MFC*/
     dri_bo_unreference(mfc_context->post_deblocking_output.bo);

diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c
index c7d4e5d..78cb73b 100644 (file)
--- a/src/gen75_mfd.c
+++ b/src/gen75_mfd.c
@@ -622,14 +622,6 @@ gen75_mfd_bsp_buf_base_addr_state(VADriverContextP ctx,
 }
 
 static void
-gen75_mfd_aes_state(VADriverContextP ctx,
-                   struct decode_state *decode_state,
-                   int standard_select)
-{
-    /* FIXME */
-}
-
-static void
 gen75_mfd_qm_state(VADriverContextP ctx,
                   int qm_type,
                   unsigned char *qm,
@@ -648,18 +640,6 @@ gen75_mfd_qm_state(VADriverContextP ctx,
     intel_batchbuffer_data(batch, qm_buffer, 16 * 4);
     ADVANCE_BCS_BATCH(batch);
 }
-static void
-gen75_mfd_wait(VADriverContextP ctx,
-              struct decode_state *decode_state,
-              int standard_select,
-              struct gen7_mfd_context *gen7_mfd_context)
-{
-    struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 1);
-    OUT_BCS_BATCH(batch, MFX_WAIT | (1 << 8));
-    ADVANCE_BCS_BATCH(batch);
-}
 
 static void
 gen75_mfd_avc_img_state(VADriverContextP ctx,
@@ -776,7 +756,6 @@ gen75_mfd_avc_picid_state(VADriverContextP ctx,
                       struct decode_state *decode_state,
                       struct gen7_mfd_context *gen7_mfd_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
 
     BEGIN_BCS_BATCH(batch, 10);
@@ -3054,7 +3033,6 @@ static void
 gen75_jpeg_wa_ind_obj_base_addr_state_bplus(VADriverContextP ctx,
                                      struct gen7_mfd_context *gen7_mfd_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
 
     BEGIN_BCS_BATCH(batch, 26);

diff --git a/src/gen75_vme.c b/src/gen75_vme.c
index ca18a46..4c39a23 100644 (file)
--- a/src/gen75_vme.c
+++ b/src/gen75_vme.c
@@ -28,6 +28,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
@@ -704,7 +705,6 @@ static VAStatus gen75_vme_prepare(VADriverContextP ctx,
                                  struct encode_state *encode_state,
                                  struct gen6_encoder_context *gen6_encoder_context)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
     VAStatus vaStatus = VA_STATUS_SUCCESS;
     VAEncSliceParameterBuffer *pSliceParameter = (VAEncSliceParameterBuffer *)encode_state->slice_params[0]->buffer;
     int is_intra = pSliceParameter->slice_flags.bits.is_intra;

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 8cb9753..aec9694 100755 (executable)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -403,14 +403,6 @@ gen7_mfd_bsp_buf_base_addr_state(VADriverContextP ctx,
 }
 
 static void
-gen7_mfd_aes_state(VADriverContextP ctx,
-                   struct decode_state *decode_state,
-                   int standard_select)
-{
-    /* FIXME */
-}
-
-static void
 gen7_mfd_qm_state(VADriverContextP ctx,
                   int qm_type,
                   unsigned char *qm,
@@ -429,18 +421,6 @@ gen7_mfd_qm_state(VADriverContextP ctx,
     intel_batchbuffer_data(batch, qm_buffer, 16 * 4);
     ADVANCE_BCS_BATCH(batch);
 }
-static void
-gen7_mfd_wait(VADriverContextP ctx,
-              struct decode_state *decode_state,
-              int standard_select,
-              struct gen7_mfd_context *gen7_mfd_context)
-{
-    struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
-
-    BEGIN_BCS_BATCH(batch, 1);
-    OUT_BCS_BATCH(batch, MFX_WAIT | (1 << 8));
-    ADVANCE_BCS_BATCH(batch);
-}
 
 static void
 gen7_mfd_avc_img_state(VADriverContextP ctx,

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index f99a0f8..1180114 100644 (file)
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -82,7 +82,6 @@
                                          IS_GEN7((ctx)->intel.device_id))
 
 #define HAS_ACCELERATED_PUTIMAGE(ctx)   HAS_VPP(ctx)
-static int get_sampling_from_fourcc(unsigned int fourcc);
 
 #if VA_CHECK_VERSION(0,33,0)
 /* Check whether we are rendering to X11 (VA/X11 or VA/GLX API) */

diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index d8ac804..f10cadd 100755 (executable)
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -2431,12 +2431,11 @@ gen7_pp_plx_avs_initialize(VADriverContextP ctx, struct i965_post_processing_con
     struct i965_sampler_8x8_state *sampler_8x8_state;
     int index, i;
     int width[3], height[3], pitch[3], offset[3];
-    int src_width, src_height;
+    int src_height;
 
     /* source surface */
     gen7_pp_set_media_rw_message_surface(ctx, pp_context, src_surface, 0, 0,
                                          width, height, pitch, offset);
-    src_width = width[0];
     src_height = height[0];
 
     /* destination surface */

diff --git a/src/i965_render.c b/src/i965_render.c
index 4a72b56..4adfba6 100644 (file)
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -891,16 +891,11 @@ i965_subpic_render_src_surfaces_state(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
     struct object_surface *obj_surface = SURFACE(surface);
-    int w, h;
-    dri_bo *region;
     dri_bo *subpic_region;
     struct object_subpic *obj_subpic = SUBPIC(obj_surface->subpic);
     struct object_image *obj_image = IMAGE(obj_subpic->image);
     assert(obj_surface);
     assert(obj_surface->bo);
-    w = obj_surface->width;
-    h = obj_surface->height;
-    region = obj_surface->bo;
     subpic_region = obj_image->bo;
     /*subpicture surface*/
     i965_render_src_surface_state(ctx, 1, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->pitch, obj_subpic->format, 0);     

diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h
index 825aded..70ceddb 100644 (file)
--- a/src/intel_batchbuffer.h
+++ b/src/intel_batchbuffer.h
@@ -31,6 +31,7 @@ void intel_batchbuffer_free(struct intel_batchbuffer *batch);
 void intel_batchbuffer_start_atomic(struct intel_batchbuffer *batch, unsigned int size);
 void intel_batchbuffer_start_atomic_bcs(struct intel_batchbuffer *batch, unsigned int size);
 void intel_batchbuffer_start_atomic_blt(struct intel_batchbuffer *batch, unsigned int size);
+void intel_batchbuffer_start_atomic_veb(struct intel_batchbuffer *batch, unsigned int size);
 void intel_batchbuffer_end_atomic(struct intel_batchbuffer *batch);
 void intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch, unsigned int x);
 void intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch, dri_bo *bo, 

diff --git a/src/intel_driver.c b/src/intel_driver.c
index 87c7e9d..7f7c66f 100644 (file)
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -51,9 +51,17 @@ static void intel_driver_get_revid(struct intel_driver_data *intel, int *value)
        char config_data[16];
        
        fp = fopen("/sys/devices/pci0000:00/0000:00:02.0/config", "r");
-       fread(config_data, 1, 16, fp);
-       fclose(fp);
-       *value = config_data[PCI_REVID];
+
+        if (fp) {
+            if (fread(config_data, 1, 16, fp))
+                *value = config_data[PCI_REVID];
+            else
+                *value = 2; /* assume it is at least  B-steping */
+            fclose(fp);
+        } else {
+            *value = 2; /* assume it is at least  B-steping */
+        }
+
        return;
 }