freedreno: add gmem_lock

The gmem state is split out now, so it does not require synchronization.
But gmem rendering still accesses vsc state from the context.

TODO maybe there is a better way?  For gen's that don't do vsc resizing,
this is probably easier.. but for a6xx there isn't really a great
position for more fine grained locking.  Maybe it doesn't matter since
in practice the lock shouldn't be contended.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3503>
This commit is contained in:
Rob Clark
2020-01-21 15:59:22 -08:00
committed by Marge Bot
parent 91f9bb99c5
commit b3b1fa5e2b
3 changed files with 18 additions and 0 deletions
@@ -202,6 +202,8 @@ fd_context_destroy(struct pipe_context *pctx)
fd_device_del(ctx->dev);
fd_pipe_del(ctx->pipe);
mtx_destroy(&ctx->gmem_lock);
if (fd_mesa_debug & (FD_DBG_BSTAT | FD_DBG_MSGS)) {
printf("batch_total=%u, batch_sysmem=%u, batch_gmem=%u, batch_nondraw=%u, batch_restore=%u\n",
(uint32_t)ctx->stats.batch_total, (uint32_t)ctx->stats.batch_sysmem,
@@ -362,6 +364,8 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen,
if (primtypes[i])
ctx->primtype_mask |= (1 << i);
(void) mtx_init(&ctx->gmem_lock, mtx_plain);
/* need some sane default in case state tracker doesn't
* set some state:
*/
@@ -159,6 +159,16 @@ enum fd_dirty_shader_state {
struct fd_context {
struct pipe_context base;
/* We currently need to serialize emitting GMEM batches, because of
* VSC state access in the context.
*
* In practice this lock should not be contended, since pipe_context
* use should be single threaded. But it is needed to protect the
* case, with batch reordering where a ctxB batch triggers flushing
* a ctxA batch
*/
mtx_t gmem_lock;
struct fd_device *dev;
struct fd_screen *screen;
struct fd_pipe *pipe;
@@ -460,6 +460,8 @@ render_tiles(struct fd_batch *batch, struct fd_gmem_stateobj *gmem)
struct fd_context *ctx = batch->ctx;
int i;
mtx_lock(&ctx->gmem_lock);
ctx->emit_tile_init(batch);
if (batch->restore)
@@ -496,6 +498,8 @@ render_tiles(struct fd_batch *batch, struct fd_gmem_stateobj *gmem)
if (ctx->emit_tile_fini)
ctx->emit_tile_fini(batch);
mtx_unlock(&ctx->gmem_lock);
}
static void