Fix the wrong setting in MI_BATCH_BATCH_START command on Snb/Ivy/Haswell

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>

diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index d7d4ba2..8f0006f 100644 (file)
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -520,7 +520,7 @@ static void gen6_vme_pipeline_programing(VADriverContextP ctx,
     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, 

diff --git a/src/gen75_vme.c b/src/gen75_vme.c
index 7f788b8..0467f38 100644 (file)
--- a/src/gen75_vme.c
+++ b/src/gen75_vme.c
@@ -613,7 +613,7 @@ static void gen75_vme_pipeline_programing(VADriverContextP ctx,
     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, 
@@ -925,7 +925,7 @@ gen75_vme_mpeg2_pipeline_programing(VADriverContextP ctx,
     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, 

diff --git a/src/gen75_vpp_gpe.c b/src/gen75_vpp_gpe.c
index ac09100..791ee3d 100644 (file)
--- a/src/gen75_vpp_gpe.c
+++ b/src/gen75_vpp_gpe.c
@@ -281,7 +281,7 @@ gen75_gpe_process_pipeline_setup(VADriverContextP ctx,
     gen75_gpe_process_parameters_fill(ctx, vpp_gpe_ctx);
    
     BEGIN_BATCH(vpp_gpe_ctx->batch, 2);
-    OUT_BATCH(vpp_gpe_ctx->batch, MI_BATCH_BUFFER_START | (2 << 6));
+    OUT_BATCH(vpp_gpe_ctx->batch, MI_BATCH_BUFFER_START | (1 << 8));
     OUT_RELOC(vpp_gpe_ctx->batch,
               vpp_gpe_ctx->vpp_batchbuffer.bo,
               I915_GEM_DOMAIN_COMMAND, 0, 

diff --git a/src/gen7_vme.c b/src/gen7_vme.c
index a708145..042fe5d 100644 (file)
--- a/src/gen7_vme.c
+++ b/src/gen7_vme.c
@@ -638,7 +638,7 @@ static void gen7_vme_pipeline_programing(VADriverContextP ctx,
     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, 
@@ -917,7 +917,7 @@ gen7_vme_mpeg2_pipeline_programing(VADriverContextP ctx,
     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, 

diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index e058378..45d5561 100755 (executable)
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -5419,7 +5419,7 @@ gen6_pp_object_walker(VADriverContextP ctx,
        ADVANCE_BATCH(batch);
     } else {
        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, command_buffer, 
               I915_GEM_DOMAIN_COMMAND, 0, 
               0);