Commit efe2cdd4 authored by Xiang, Haihao's avatar Xiang, Haihao

i965_drv_video: Enable BLT ring

Use BLT ring to clear background
Signed-off-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
parent 3630d4df
......@@ -1265,6 +1265,9 @@ i965_clear_dest_region(VADriverContextP ctx)
br13 |= pitch;
if (IS_GEN6(i965->intel.device_id))
BEGIN_BLT_BATCH(ctx, 6);
else
BEGIN_BATCH(ctx, 6);
OUT_BATCH(ctx, blt_cmd);
OUT_BATCH(ctx, br13);
......@@ -1281,9 +1284,9 @@ i965_clear_dest_region(VADriverContextP ctx)
static void
i965_surface_render_pipeline_setup(VADriverContextP ctx)
{
i965_clear_dest_region(ctx);
intel_batchbuffer_start_atomic(ctx, 0x1000);
intel_batchbuffer_emit_mi_flush(ctx);
i965_clear_dest_region(ctx);
i965_render_pipeline_select(ctx);
i965_render_state_sip(ctx);
i965_render_state_base_address(ctx);
......@@ -1914,6 +1917,7 @@ gen6_render_put_surface(VADriverContextP ctx,
gen6_render_setup_states(ctx, surface,
srcx, srcy, srcw, srch,
destx, desty, destw, desth);
i965_clear_dest_region(ctx);
gen6_render_emit_states(ctx, PS_KERNEL);
intel_batchbuffer_flush(ctx);
}
......
......@@ -40,6 +40,7 @@ intel_batchbuffer_reset(struct intel_batchbuffer *batch)
int batch_size = BATCH_SIZE;
assert(batch->flag == I915_EXEC_RENDER ||
batch->flag == I915_EXEC_BLT ||
batch->flag == I915_EXEC_BSD);
dri_bo_unreference(batch->buffer);
......@@ -284,9 +285,20 @@ intel_batchbuffer_data_bcs(VADriverContextP ctx, void *data, unsigned int size)
void
intel_batchbuffer_emit_mi_flush(VADriverContextP ctx)
{
struct intel_driver_data *intel = intel_driver_data(ctx);
if (intel->batch->flag == I915_EXEC_BLT) {
BEGIN_BLT_BATCH(ctx, 4);
OUT_BATCH(ctx, MI_FLUSH_DW);
OUT_BATCH(ctx, 0);
OUT_BATCH(ctx, 0);
OUT_BATCH(ctx, 0);
ADVANCE_BATCH(ctx);
} else if (intel->batch->flag == I915_EXEC_RENDER) {
BEGIN_BATCH(ctx, 1);
OUT_BATCH(ctx, MI_FLUSH | MI_FLUSH_STATE_INSTRUCTION_CACHE_INVALIDATE);
ADVANCE_BATCH(ctx);
}
}
void
......@@ -322,7 +334,7 @@ void
intel_batchbuffer_start_atomic(VADriverContextP ctx, unsigned int size)
{
struct intel_driver_data *intel = intel_driver_data(ctx);
intel_batchbuffer_check_batchbuffer_flag(ctx, I915_EXEC_RENDER);
intel_batchbuffer_start_atomic_helper(ctx, intel->batch, size);
}
......@@ -400,3 +412,20 @@ intel_batchbuffer_advance_batch_bcs(VADriverContextP ctx)
intel_batchbuffer_advance_batch_helper(intel->batch_bcs);
}
void
intel_batchbuffer_check_batchbuffer_flag(VADriverContextP ctx, int flag)
{
struct intel_driver_data *intel = intel_driver_data(ctx);
if (flag != I915_EXEC_RENDER &&
flag != I915_EXEC_BLT &&
flag != I915_EXEC_BSD)
return;
if (intel->batch->flag == flag)
return;
intel_batchbuffer_flush_helper(ctx, intel->batch);
intel->batch->flag = flag;
}
......@@ -57,10 +57,16 @@ Bool intel_batchbuffer_flush_bcs(VADriverContextP ctx);
void intel_batchbuffer_begin_batch_bcs(VADriverContextP ctx, int total);
void intel_batchbuffer_advance_batch_bcs(VADriverContextP ctx);
#define BEGIN_BATCH(ctx, n) do { \
void intel_batchbuffer_check_batchbuffer_flag(VADriverContextP ctx, int flag);
#define __BEGIN_BATCH(ctx, n, flag) do { \
intel_batchbuffer_check_batchbuffer_flag(ctx, flag); \
intel_batchbuffer_require_space(ctx, (n) * 4); \
intel_batchbuffer_begin_batch(ctx, (n)); \
} while (0)
} while (0)
#define BEGIN_BATCH(ctx, n) __BEGIN_BATCH(ctx, n, I915_EXEC_RENDER)
#define BEGIN_BLT_BATCH(ctx, n) __BEGIN_BATCH(ctx, n, I915_EXEC_BLT)
#define OUT_BATCH(ctx, d) do { \
intel_batchbuffer_emit_dword(ctx, d); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment