diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2020-09-30 14:09:45 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-10-01 13:21:29 +0100 |
| commit | 1a7ef7eb5e99c9a8f4ffbc13cdae399a01a9aa12 (patch) | |
| tree | 6f6d16ad2ac076d3d98373adcc0a93c7daec21de /lib/rendercopy_gen4.c | |
| parent | 19ae9421a5af7b03a1c9a577c57f2cf8b16a0116 (diff) | |
lib/intel_batchbuffer: Prepare batch to use in allocator infrastructure
With upcoming of allocator code we need to ensure batch will execute
with appropriate context. If mismatch between allocator data and batch
could lead to strange or wrong results. All functions which could change
context in execbuf called from intel_bb were removed.
As an allocator requires size (which was not previously required in
intel_bb) adding object to intel_bb is now mandatory.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Dominik Grzegorzek <dominik.grzegorzek@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/rendercopy_gen4.c')
| -rw-r--r-- | lib/rendercopy_gen4.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/rendercopy_gen4.c b/lib/rendercopy_gen4.c index 279067ce..8536d6b6 100644 --- a/lib/rendercopy_gen4.c +++ b/lib/rendercopy_gen4.c @@ -626,7 +626,6 @@ static uint32_t gen4_emit_primitive(struct intel_bb *ibb) } void gen4_render_copyfunc(struct intel_bb *ibb, - uint32_t ctx, struct intel_buf *src, uint32_t src_x, uint32_t src_y, uint32_t width, uint32_t height, @@ -641,7 +640,7 @@ void gen4_render_copyfunc(struct intel_bb *ibb, igt_assert(src->bpp == dst->bpp); - intel_bb_flush_render_with_context(ibb, ctx); + intel_bb_flush_render(ibb); intel_bb_add_intel_buf(ibb, dst, true); intel_bb_add_intel_buf(ibb, src, false); @@ -699,8 +698,7 @@ void gen4_render_copyfunc(struct intel_bb *ibb, /* Position to valid batch end position for batch reuse */ intel_bb_ptr_set(ibb, batch_end); - intel_bb_exec_with_context(ibb, batch_end, ctx, - I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, - false); + intel_bb_exec(ibb, batch_end, + I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, false); intel_bb_reset(ibb, false); } |