From ba72554f3e576c1674d52ab16d8d2edff9398b71 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Sun, 5 Mar 2017 12:12:30 +1100 Subject: gallium/util: replace pipe_mutex_lock() with mtx_lock() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12. Replaced using: find ./src -type f -exec sed -i -- \ 's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \; Reviewed-by: Marek Olšák --- src/gallium/drivers/freedreno/freedreno_batch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/freedreno/freedreno_batch.c') diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index c6dcf11aca5..f08b7b3a1bf 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -170,7 +170,7 @@ batch_reset_resources_locked(struct fd_batch *batch) static void batch_reset_resources(struct fd_batch *batch) { - pipe_mutex_lock(batch->ctx->screen->lock); + mtx_lock(&batch->ctx->screen->lock); batch_reset_resources_locked(batch); pipe_mutex_unlock(batch->ctx->screen->lock); } @@ -203,7 +203,7 @@ __fd_batch_destroy(struct fd_batch *batch) util_copy_framebuffer_state(&batch->framebuffer, NULL); - pipe_mutex_lock(batch->ctx->screen->lock); + mtx_lock(&batch->ctx->screen->lock); fd_bc_invalidate_batch(batch, true); pipe_mutex_unlock(batch->ctx->screen->lock); @@ -287,7 +287,7 @@ batch_flush(struct fd_batch *batch) if (batch == batch->ctx->batch) { batch_reset(batch); } else { - pipe_mutex_lock(batch->ctx->screen->lock); + mtx_lock(&batch->ctx->screen->lock); fd_bc_invalidate_batch(batch, false); pipe_mutex_unlock(batch->ctx->screen->lock); } @@ -339,7 +339,7 @@ batch_add_dep(struct fd_batch *batch, struct fd_batch *dep) DBG("%p: flush forced on %p!", batch, dep); pipe_mutex_unlock(batch->ctx->screen->lock); fd_batch_flush(dep, false); - pipe_mutex_lock(batch->ctx->screen->lock); + mtx_lock(&batch->ctx->screen->lock); } else { struct fd_batch *other = NULL; fd_batch_reference_locked(&other, dep); -- cgit v1.2.3