openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2025-02-08 02:57:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zink: add locking for batch states

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9885>
This commit is contained in:
Mike Blumenkrantz 2021-03-22 10:27:50 -04:00 committed by Marge Bot
parent c452c82b98
commit 6eaaaaa542
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/zink/zink_batch.c
View File

@ -97,12 +97,14 @@ zink_clear_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
void
zink_batch_reset_all(struct zink_context *ctx)
{
simple_mtx_lock(&ctx->batch_mtx);
hash_table_foreach(&ctx->batch_states, entry) {
struct zink_batch_state *bs = entry->data;
zink_reset_batch_state(ctx, bs);
_mesa_hash_table_remove(&ctx->batch_states, entry);
util_dynarray_append(&ctx->free_batch_states, struct zink_batch_state *, bs);
}
simple_mtx_unlock(&ctx->batch_mtx);
}
void
@ -186,6 +188,7 @@ init_batch_state(struct zink_context *ctx, struct zink_batch *batch)
{
struct zink_batch_state *bs = NULL;
simple_mtx_lock(&ctx->batch_mtx);
if (util_dynarray_num_elements(&ctx->free_batch_states, struct zink_batch_state*))
bs = util_dynarray_pop(&ctx->free_batch_states, struct zink_batch_state*);
if (!bs) {
@ -195,6 +198,7 @@ init_batch_state(struct zink_context *ctx, struct zink_batch *batch)
_mesa_hash_table_remove(&ctx->batch_states, he);
}
}
simple_mtx_unlock(&ctx->batch_mtx);
if (bs)
zink_reset_batch_state(ctx, bs);
else {
@ -300,9 +304,10 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch)
ctx->reset.reset(ctx->reset.data, PIPE_GUILTY_CONTEXT_RESET);
}
}
simple_mtx_lock(&ctx->batch_mtx);
ctx->last_fence = &batch->state->fence;
_mesa_hash_table_insert_pre_hashed(&ctx->batch_states, batch->state->fence.batch_id, (void*)(uintptr_t)batch->state->fence.batch_id, batch->state);
simple_mtx_unlock(&ctx->batch_mtx);
ctx->resource_size += batch->state->resource_size;
}

12
src/gallium/drivers/zink/zink_context.c
View File

@ -302,6 +302,7 @@ zink_context_destroy(struct pipe_context *pctx)
for (unsigned i = 0; i < ARRAY_SIZE(ctx->null_buffers); i++)
pipe_resource_reference(&ctx->null_buffers[i], NULL);
simple_mtx_destroy(&ctx->batch_mtx);
struct zink_fence *fence = zink_fence(&ctx->batch.state);
zink_clear_batch_state(ctx, ctx->batch.state);
zink_fence_reference(screen, &fence, NULL);
@ -1930,6 +1931,7 @@ zink_wait_on_batch(struct zink_context *ctx, uint32_t batch_id)
/* not submitted yet */
flush_batch(ctx);
simple_mtx_lock(&ctx->batch_mtx);
struct zink_fence *fence;
assert(batch_id || ctx->last_fence);
@ -1939,18 +1941,23 @@ zink_wait_on_batch(struct zink_context *ctx, uint32_t batch_id)
struct hash_entry *he = _mesa_hash_table_search_pre_hashed(&ctx->batch_states, batch_id, (void*)(uintptr_t)batch_id);
if (!he) {
util_dynarray_foreach(&ctx->free_batch_states, struct zink_batch_state*, bs) {
if ((*bs)->fence.batch_id == batch_id)
if ((*bs)->fence.batch_id == batch_id) {
simple_mtx_unlock(&ctx->batch_mtx);
return;
}
}
if (ctx->last_fence && ctx->last_fence->batch_id > batch_id)
if (ctx->last_fence && ctx->last_fence->batch_id > batch_id) {
/* already completed */
simple_mtx_unlock(&ctx->batch_mtx);
return;
}
unreachable("should've found batch state");
}
fence = he->data;
}
assert(fence);
ctx->base.screen->fence_finish(ctx->base.screen, &ctx->base, (struct pipe_fence_handle*)fence, PIPE_TIMEOUT_INFINITE);
simple_mtx_unlock(&ctx->batch_mtx);
}
static void
@ -2564,6 +2571,7 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
goto fail;
vkGetDeviceQueue(screen->dev, screen->gfx_queue, 0, &ctx->queue);
simple_mtx_init(&ctx->batch_mtx, mtx_plain);
ctx->program_cache = _mesa_hash_table_create(NULL,
hash_gfx_program,

1
src/gallium/drivers/zink/zink_context.h
View File

@ -134,6 +134,7 @@ struct zink_context {
uint32_t curr_batch; //the current batch id
struct zink_batch batch;
simple_mtx_t batch_mtx;
struct zink_fence *last_fence; //the last command buffer submitted
VkQueue queue; //gfx+compute
struct hash_table batch_states; //submitted batch states