diff options
author | Zhao Yakui <yakui.zhao@intel.com> | 2014-01-22 09:37:20 +0800 |
---|---|---|
committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-09-30 12:21:02 +0100 |
commit | f04bf00c0d4e3b19fea63ad1d0b959575baf43b5 (patch) | |
tree | b4981d2e3f460318dfe4caf38274240fa690f1a0 /lib | |
parent | ecd659e000dc3165c33793b7da612863738dc1c5 (diff) |
rendercopy/skl: Pass the context to rendercopy function on SKL
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Ben Widawsky <benjamin.widawsky@intel.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rendercopy.h | 1 | ||||
-rw-r--r-- | lib/rendercopy_gen9.c | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/rendercopy.h b/lib/rendercopy.h index f15df0e45..fdc3cabb2 100644 --- a/lib/rendercopy.h +++ b/lib/rendercopy.h @@ -24,6 +24,7 @@ static inline void emit_vertex_normalized(struct intel_batchbuffer *batch, } void gen9_render_copyfunc(struct intel_batchbuffer *batch, + drm_intel_context *context, struct igt_buf *src, unsigned src_x, unsigned src_y, unsigned width, unsigned height, struct igt_buf *dst, unsigned dst_x, unsigned dst_y); diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c index 01d5ef359..40f1c6f10 100644 --- a/lib/rendercopy_gen9.c +++ b/lib/rendercopy_gen9.c @@ -166,14 +166,15 @@ batch_copy(struct intel_batchbuffer *batch, const void *ptr, uint32_t size, uint } static void -gen6_render_flush(struct intel_batchbuffer *batch, uint32_t batch_end) +gen6_render_flush(struct intel_batchbuffer *batch, + drm_intel_context *context, uint32_t batch_end) { int ret; ret = drm_intel_bo_subdata(batch->bo, 0, 4096, batch->buffer); if (ret == 0) - ret = drm_intel_bo_mrb_exec(batch->bo, batch_end, - NULL, 0, 0, 0); + ret = drm_intel_gem_bo_context_exec(batch->bo, context, + batch_end, 0); assert(ret == 0); } @@ -872,6 +873,7 @@ static void gen8_emit_primitive(struct intel_batchbuffer *batch, uint32_t offset #define BATCH_STATE_SPLIT 2048 void gen9_render_copyfunc(struct intel_batchbuffer *batch, + drm_intel_context *context, struct igt_buf *src, unsigned src_x, unsigned src_y, unsigned width, unsigned height, struct igt_buf *dst, unsigned dst_x, unsigned dst_y) @@ -881,7 +883,7 @@ void gen9_render_copyfunc(struct intel_batchbuffer *batch, uint32_t vertex_buffer; uint32_t batch_end; - intel_batchbuffer_flush(batch); + intel_batchbuffer_flush_with_context(batch, context); batch_align(batch, 8); @@ -971,6 +973,6 @@ void gen9_render_copyfunc(struct intel_batchbuffer *batch, annotation_flush(&aub_annotations, batch); - gen6_render_flush(batch, batch_end); + gen6_render_flush(batch, context, batch_end); intel_batchbuffer_reset(batch); } |