diff options
Diffstat (limited to 'src/gallium/drivers/freedreno')
5 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index f08b7b3a1bf..5cd6a697e13 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -172,7 +172,7 @@ batch_reset_resources(struct fd_batch *batch) { mtx_lock(&batch->ctx->screen->lock); batch_reset_resources_locked(batch); - pipe_mutex_unlock(batch->ctx->screen->lock); + mtx_unlock(&batch->ctx->screen->lock); } static void @@ -205,7 +205,7 @@ __fd_batch_destroy(struct fd_batch *batch) mtx_lock(&batch->ctx->screen->lock); fd_bc_invalidate_batch(batch, true); - pipe_mutex_unlock(batch->ctx->screen->lock); + mtx_unlock(&batch->ctx->screen->lock); batch_fini(batch); @@ -289,7 +289,7 @@ batch_flush(struct fd_batch *batch) } else { mtx_lock(&batch->ctx->screen->lock); fd_bc_invalidate_batch(batch, false); - pipe_mutex_unlock(batch->ctx->screen->lock); + mtx_unlock(&batch->ctx->screen->lock); } } @@ -337,7 +337,7 @@ batch_add_dep(struct fd_batch *batch, struct fd_batch *dep) */ if (batch_depends_on(dep, batch)) { DBG("%p: flush forced on %p!", batch, dep); - pipe_mutex_unlock(batch->ctx->screen->lock); + mtx_unlock(&batch->ctx->screen->lock); fd_batch_flush(dep, false); mtx_lock(&batch->ctx->screen->lock); } else { diff --git a/src/gallium/drivers/freedreno/freedreno_batch_cache.c b/src/gallium/drivers/freedreno/freedreno_batch_cache.c index 5a881bffd42..9fea7d68271 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch_cache.c +++ b/src/gallium/drivers/freedreno/freedreno_batch_cache.c @@ -136,7 +136,7 @@ fd_bc_flush(struct fd_batch_cache *cache, struct fd_context *ctx) struct fd_batch *batch = NULL; fd_batch_reference_locked(&batch, (struct fd_batch *)entry->data); if (batch->ctx == ctx) { - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); fd_batch_reference(&last_batch, batch); fd_batch_flush(batch, false); mtx_lock(&ctx->screen->lock); @@ -144,7 +144,7 @@ fd_bc_flush(struct fd_batch_cache *cache, struct fd_context *ctx) fd_batch_reference_locked(&batch, NULL); } - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); if (last_batch) { fd_batch_sync(last_batch); @@ -165,7 +165,7 @@ fd_bc_invalidate_context(struct fd_context *ctx) fd_batch_reference_locked(&batch, NULL); } - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); } void @@ -224,7 +224,7 @@ fd_bc_invalidate_resource(struct fd_resource *rsc, bool destroy) rsc->bc_batch_mask = 0; - pipe_mutex_unlock(screen->lock); + mtx_unlock(&screen->lock); } struct fd_batch * @@ -263,7 +263,7 @@ fd_bc_alloc_batch(struct fd_batch_cache *cache, struct fd_context *ctx) /* we can drop lock temporarily here, since we hold a ref, * flush_batch won't disappear under us. */ - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); DBG("%p: too many batches! flush forced!", flush_batch); fd_batch_flush(flush_batch, true); mtx_lock(&ctx->screen->lock); @@ -303,7 +303,7 @@ fd_bc_alloc_batch(struct fd_batch_cache *cache, struct fd_context *ctx) cache->batches[idx] = batch; out: - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); return batch; } @@ -349,7 +349,7 @@ batch_from_key(struct fd_batch_cache *cache, struct key *key, rsc->bc_batch_mask = (1 << batch->idx); } - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); return batch; } diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index d65f19a8240..cb33b8c0dfc 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -322,7 +322,7 @@ fd_context_lock(struct fd_context *ctx) static inline void fd_context_unlock(struct fd_context *ctx) { - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); } static inline struct pipe_scissor_state * diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index b98faca60ee..edeb88bf34b 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -172,7 +172,7 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) resource_written(batch, batch->query_buf); - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); batch->num_draws++; @@ -346,7 +346,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, resource_written(batch, batch->query_buf); - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); DBG("%p: %x %ux%u depth=%f, stencil=%u (%s/%s)", batch, buffers, pfb->width, pfb->height, depth, stencil, diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c index 275de97b8c7..a24f3f30903 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.c +++ b/src/gallium/drivers/freedreno/freedreno_resource.c @@ -212,7 +212,7 @@ fd_try_shadow_resource(struct fd_context *ctx, struct fd_resource *rsc, } swap(rsc->batch_mask, shadow->batch_mask); - pipe_mutex_unlock(ctx->screen->lock); + mtx_unlock(&ctx->screen->lock); struct pipe_blit_info blit = {0}; blit.dst.resource = prsc; |