radeonsi: use a separate allocator for fine fences

Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-12-05 20:04:11 +01:00
parent 3e1287caef
commit 7a6643fb4c
3 changed files with 9 additions and 1 deletions

View file

@ -454,6 +454,11 @@ bool si_common_context_init(struct r600_common_context *rctx,
if (!rctx->b.const_uploader)
return false;
rctx->cached_gtt_allocator = u_upload_create(&rctx->b, 16 * 1024,
0, PIPE_USAGE_STAGING, 0);
if (!rctx->cached_gtt_allocator)
return false;
rctx->ctx = rctx->ws->ctx_create(rctx->ws);
if (!rctx->ctx)
return false;
@ -498,6 +503,8 @@ void si_common_context_cleanup(struct r600_common_context *rctx)
u_upload_destroy(rctx->b.stream_uploader);
if (rctx->b.const_uploader)
u_upload_destroy(rctx->b.const_uploader);
if (rctx->cached_gtt_allocator)
u_upload_destroy(rctx->cached_gtt_allocator);
slab_destroy_child(&rctx->pool_transfers);
slab_destroy_child(&rctx->pool_transfers_unsync);

View file

@ -395,6 +395,7 @@ struct r600_common_context {
struct pipe_fence_handle *last_gfx_fence;
struct pipe_fence_handle *last_sdma_fence;
struct r600_resource *eop_bug_scratch;
struct u_upload_mgr *cached_gtt_allocator;
unsigned num_gfx_cs_flushes;
unsigned initial_gfx_cs_size;
unsigned gpu_reset_counter;

View file

@ -151,7 +151,7 @@ static void si_fine_fence_set(struct si_context *ctx,
assert(util_bitcount(flags & (PIPE_FLUSH_TOP_OF_PIPE | PIPE_FLUSH_BOTTOM_OF_PIPE)) == 1);
/* Use uncached system memory for the fence. */
u_upload_alloc(ctx->b.b.stream_uploader, 0, 4, 4,
u_upload_alloc(ctx->b.cached_gtt_allocator, 0, 4, 4,
&fine->offset, (struct pipe_resource **)&fine->buf, (void **)&fence_ptr);
if (!fine->buf)
return;