Module: Mesa Branch: master Commit: 150a914a786281e20a97fc03d7aaf4d6454bd618 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=150a914a786281e20a97fc03d7aaf4d6454bd618
Author: Rob Clark <[email protected]> Date: Wed Nov 18 12:33:27 2020 -0800 freedreno: Convert one last mtx_t -> simple_mtx_t Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7717> --- src/gallium/drivers/freedreno/freedreno_context.c | 4 ++-- src/gallium/drivers/freedreno/freedreno_context.h | 2 +- src/gallium/drivers/freedreno/freedreno_gmem.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c index 775e0e151c2..11efe3a6367 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -342,7 +342,7 @@ fd_context_destroy(struct pipe_context *pctx) fd_device_del(ctx->dev); fd_pipe_del(ctx->pipe); - mtx_destroy(&ctx->gmem_lock); + simple_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", @@ -506,7 +506,7 @@ 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); + simple_mtx_init(&ctx->gmem_lock, mtx_plain); /* need some sane default in case gallium frontends don't * set some state: diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index 564c0ba66f2..1788f70cdaa 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -199,7 +199,7 @@ struct fd_context { * case, with batch reordering where a ctxB batch triggers flushing * a ctxA batch */ - mtx_t gmem_lock; + simple_mtx_t gmem_lock; struct fd_device *dev; struct fd_screen *screen; diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c index b97b41ae470..72f2582ce84 100644 --- a/src/gallium/drivers/freedreno/freedreno_gmem.c +++ b/src/gallium/drivers/freedreno/freedreno_gmem.c @@ -577,7 +577,7 @@ render_tiles(struct fd_batch *batch, struct fd_gmem_stateobj *gmem) struct fd_context *ctx = batch->ctx; int i; - mtx_lock(&ctx->gmem_lock); + simple_mtx_lock(&ctx->gmem_lock); ctx->emit_tile_init(batch); @@ -619,7 +619,7 @@ 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); + simple_mtx_unlock(&ctx->gmem_lock); } static void _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
