silence compiler warning

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

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index 8d8d86d..dec616a 100644 (file)
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -413,6 +413,7 @@ gen6_mfd_bsp_buf_base_addr_state(VADriverContextP ctx,
     ADVANCE_BCS_BATCH(batch);
 }
 
+#if 0
 static void
 gen6_mfd_aes_state(VADriverContextP ctx,
                    struct decode_state *decode_state,
@@ -433,6 +434,7 @@ gen6_mfd_wait(VADriverContextP ctx,
     OUT_BCS_BATCH(batch, MFX_WAIT | (1 << 8));
     ADVANCE_BCS_BATCH(batch);
 }
+#endif
 
 static void
 gen6_mfd_avc_img_state(VADriverContextP ctx,

diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index dd6fb65..26b65c7 100644 (file)
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -634,11 +634,11 @@ 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;
+    // 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;
+    // constant_buffer = vme_context->curbe.bo->virtual;
        
     /*TODO copy buffer into CURB*/
 

diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index effba99..d5d24db 100644 (file)
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -426,6 +426,7 @@ gen7_mfd_bsp_buf_base_addr_state(VADriverContextP ctx,
     ADVANCE_BCS_BATCH(batch);
 }
 
+#if 0
 static void
 gen7_mfd_aes_state(VADriverContextP ctx,
                    struct decode_state *decode_state,
@@ -433,6 +434,7 @@ gen7_mfd_aes_state(VADriverContextP ctx,
 {
     /* FIXME */
 }
+#endif
 
 static void
 gen7_mfd_qm_state(VADriverContextP ctx,
@@ -453,6 +455,8 @@ gen7_mfd_qm_state(VADriverContextP ctx,
     intel_batchbuffer_data(batch, qm_buffer, 16 * 4);
     ADVANCE_BCS_BATCH(batch);
 }
+
+#if 0
 static void
 gen7_mfd_wait(VADriverContextP ctx,
               struct decode_state *decode_state,
@@ -465,6 +469,7 @@ gen7_mfd_wait(VADriverContextP ctx,
     OUT_BCS_BATCH(batch, MFX_WAIT | (1 << 8));
     ADVANCE_BCS_BATCH(batch);
 }
+#endif
 
 static void
 gen7_mfd_avc_img_state(VADriverContextP ctx,
@@ -472,7 +477,6 @@ gen7_mfd_avc_img_state(VADriverContextP ctx,
                        struct gen7_mfd_context *gen7_mfd_context)
 {
     struct intel_batchbuffer *batch = gen7_mfd_context->base.batch;
-    int qm_present_flag;
     int img_struct;
     int mbaff_frame_flag;
     unsigned int width_in_mbs, height_in_mbs;
@@ -482,11 +486,6 @@ gen7_mfd_avc_img_state(VADriverContextP ctx,
     pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
     assert(!(pic_param->CurrPic.flags & VA_PICTURE_H264_INVALID));
 
-    if (decode_state->iq_matrix && decode_state->iq_matrix->buffer)
-        qm_present_flag = 1;
-    else
-        qm_present_flag = 0; /* built-in QM matrices */
-
     if (pic_param->CurrPic.flags & VA_PICTURE_H264_TOP_FIELD)
         img_struct = 1;
     else if (pic_param->CurrPic.flags & VA_PICTURE_H264_BOTTOM_FIELD)

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 0376e53..98955b3 100644 (file)
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -1488,7 +1488,7 @@ i965_decoder_render_picture(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
     struct object_context *obj_context = CONTEXT(context);
-    VAStatus vaStatus;
+    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
     int i;
 
     for (i = 0; i < num_buffers; i++) {
@@ -1586,7 +1586,7 @@ i965_encoder_render_picture(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
     struct object_context *obj_context = CONTEXT(context);
-    VAStatus vaStatus;
+    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
     int i;
 
     for (i = 0; i < num_buffers; i++) {  
@@ -1700,7 +1700,7 @@ i965_proc_render_picture(VADriverContextP ctx,
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
     struct object_context *obj_context = CONTEXT(context);
-    VAStatus vaStatus;
+    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
     int i;
 
     for (i = 0; i < num_buffers; i++) {  
@@ -2133,7 +2133,6 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
                           VAImage *out_image)        /* out */
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
     struct object_image *obj_image;
     struct object_surface *obj_surface; 
     VAImageID image_id;

diff --git a/src/i965_render.c b/src/i965_render.c
index 9be8bf7..8e851e8 100644 (file)
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -814,16 +814,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);     

diff --git a/src/intel_batchbuffer_dump.c b/src/intel_batchbuffer_dump.c
index 99c2c1c..1953b22 100644 (file)
--- a/src/intel_batchbuffer_dump.c
+++ b/src/intel_batchbuffer_dump.c
@@ -6,6 +6,8 @@
 #include "intel_driver.h"
 #include "intel_batchbuffer_dump.h"
 
+#ifdef I965_DEBUG
+
 #define BUFFER_FAIL(_count, _len, _name) do {                  \
     fprintf(gout, "Buffer size too small in %s (%d < %d)\n",   \
            (_name), (_count), (_len));                         \
@@ -769,3 +771,5 @@ int intel_batchbuffer_dump(unsigned int *data, unsigned int offset, int count, u
 
     return failures;
 }
+
+#endif

diff --git a/src/intel_batchbuffer_dump.h b/src/intel_batchbuffer_dump.h
index e76b4f7..74f4ff7 100644 (file)
--- a/src/intel_batchbuffer_dump.h
+++ b/src/intel_batchbuffer_dump.h
@@ -50,6 +50,10 @@
 #define OPCODE_MI_FLUSH                 0x04
 #define OPCODE_MI_BATCH_BUFFER_END      0x0A
 
+#ifdef I965_DEBUG
+
 int intel_batchbuffer_dump(unsigned int *data, unsigned int offset, int count, unsigned int device);
 
+#endif
+
 #endif /* _INTEL_BATCHBUFFER_DUMP_H_ */