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_gen7.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_gen7.c')
| -rw-r--r-- | lib/rendercopy_gen7.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/rendercopy_gen7.c b/lib/rendercopy_gen7.c index 62ef4325..267f6f80 100644 --- a/lib/rendercopy_gen7.c +++ b/lib/rendercopy_gen7.c @@ -507,7 +507,6 @@ gen7_emit_null_depth_buffer(struct intel_bb *ibb) #define BATCH_STATE_SPLIT 2048 void gen7_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, @@ -520,7 +519,7 @@ void gen7_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); @@ -575,9 +574,8 @@ void gen7_render_copyfunc(struct intel_bb *ibb, intel_bb_out(ibb, 0); /* index buffer offset, ignored */ intel_bb_emit_bbe(ibb); - intel_bb_exec_with_context(ibb, intel_bb_offset(ibb), ctx, - I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, - false); + intel_bb_exec(ibb, intel_bb_offset(ibb), + I915_EXEC_DEFAULT | I915_EXEC_NO_RELOC, false); dump_batch(ibb); intel_bb_reset(ibb, false); } |