Mesa (master): freedreno: drop unused arg from fd_batch_flush()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 26 16:09:32 UTC 2019
Module: Mesa
Branch: master
Commit: 2b10bb6e5ee967f0ee44559ae2cb92099a0fa372
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b10bb6e5ee967f0ee44559ae2cb92099a0fa372
Author: Rob Clark <robdclark at chromium.org>
Date: Tue Jun 25 11:21:28 2019 -0700
freedreno: drop unused arg from fd_batch_flush()
The `force` arg has been unused for a while.. but apparently I forgot to
garbage collect it.
Signed-off-by: Rob Clark <robdclark at chromium.org>
---
src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 2 +-
src/gallium/drivers/freedreno/a6xx/fd6_blitter.c | 2 +-
src/gallium/drivers/freedreno/freedreno_batch.c | 14 +++++++-------
src/gallium/drivers/freedreno/freedreno_batch.h | 2 +-
src/gallium/drivers/freedreno/freedreno_batch_cache.c | 4 ++--
src/gallium/drivers/freedreno/freedreno_context.c | 2 +-
src/gallium/drivers/freedreno/freedreno_draw.c | 2 +-
src/gallium/drivers/freedreno/freedreno_fence.c | 2 +-
src/gallium/drivers/freedreno/freedreno_query_acc.c | 4 ++--
src/gallium/drivers/freedreno/freedreno_query_hw.c | 4 ++--
src/gallium/drivers/freedreno/freedreno_resource.c | 4 ++--
src/gallium/drivers/freedreno/freedreno_state.c | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 8a829759cdc..8fdf4c47c31 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -481,7 +481,7 @@ fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
fd_resource(info->dst.resource)->valid = true;
batch->needs_flush = true;
- fd_batch_flush(batch, false, false);
+ fd_batch_flush(batch, false);
fd_batch_reference(&batch, NULL);
return true;
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c
index 3b7020510b0..afa162e9ebe 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c
@@ -698,7 +698,7 @@ handle_rgba_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
fd_resource(info->dst.resource)->valid = true;
batch->needs_flush = true;
- fd_batch_flush(batch, false, false);
+ fd_batch_flush(batch, false);
fd_batch_reference(&batch, NULL);
return true;
diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index 14b4e38568c..88d0a816c00 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -198,7 +198,7 @@ batch_flush_reset_dependencies(struct fd_batch *batch, bool flush)
foreach_batch(dep, cache, batch->dependents_mask) {
if (flush)
- fd_batch_flush(dep, false, false);
+ fd_batch_flush(dep, false);
fd_batch_reference(&dep, NULL);
}
@@ -307,7 +307,7 @@ batch_cleanup_func(void *job, int id)
}
static void
-batch_flush(struct fd_batch *batch, bool force)
+batch_flush(struct fd_batch *batch)
{
DBG("%p: needs_flush=%d", batch, batch->needs_flush);
@@ -356,7 +356,7 @@ batch_flush(struct fd_batch *batch, bool force)
* a fence to sync on
*/
void
-fd_batch_flush(struct fd_batch *batch, bool sync, bool force)
+fd_batch_flush(struct fd_batch *batch, bool sync)
{
struct fd_batch *tmp = NULL;
bool newbatch = false;
@@ -372,7 +372,7 @@ fd_batch_flush(struct fd_batch *batch, bool sync, bool force)
newbatch = true;
}
- batch_flush(tmp, force);
+ batch_flush(tmp);
if (newbatch) {
struct fd_context *ctx = batch->ctx;
@@ -438,7 +438,7 @@ flush_write_batch(struct fd_resource *rsc)
fd_batch_reference_locked(&b, rsc->write_batch);
mtx_unlock(&b->ctx->screen->lock);
- fd_batch_flush(b, true, false);
+ fd_batch_flush(b, true);
mtx_lock(&b->ctx->screen->lock);
fd_bc_invalidate_batch(b, false);
@@ -512,7 +512,7 @@ fd_batch_check_size(struct fd_batch *batch)
debug_assert(!batch->flushed);
if (unlikely(fd_mesa_debug & FD_DBG_FLUSH)) {
- fd_batch_flush(batch, true, false);
+ fd_batch_flush(batch, true);
return;
}
@@ -521,7 +521,7 @@ fd_batch_check_size(struct fd_batch *batch)
struct fd_ringbuffer *ring = batch->draw;
if ((ring->cur - ring->start) > (ring->size/4 - 0x1000))
- fd_batch_flush(batch, true, false);
+ fd_batch_flush(batch, true);
}
/* emit a WAIT_FOR_IDLE only if needed, ie. if there has not already
diff --git a/src/gallium/drivers/freedreno/freedreno_batch.h b/src/gallium/drivers/freedreno/freedreno_batch.h
index d38bd3f8b22..edf0840825b 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.h
+++ b/src/gallium/drivers/freedreno/freedreno_batch.h
@@ -229,7 +229,7 @@ struct fd_batch * fd_batch_create(struct fd_context *ctx, bool nondraw);
void fd_batch_reset(struct fd_batch *batch);
void fd_batch_sync(struct fd_batch *batch);
-void fd_batch_flush(struct fd_batch *batch, bool sync, bool force);
+void fd_batch_flush(struct fd_batch *batch, bool sync);
void fd_batch_add_dep(struct fd_batch *batch, struct fd_batch *dep);
void fd_batch_resource_used(struct fd_batch *batch, struct fd_resource *rsc, bool write);
void fd_batch_check_size(struct fd_batch *batch);
diff --git a/src/gallium/drivers/freedreno/freedreno_batch_cache.c b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
index ec3aab128a8..82b285c9c6b 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch_cache.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch_cache.c
@@ -159,7 +159,7 @@ bc_flush(struct fd_batch_cache *cache, struct fd_context *ctx, bool deferred)
fd_context_unlock(ctx);
for (unsigned i = 0; i < n; i++) {
- fd_batch_flush(batches[i], false, false);
+ fd_batch_flush(batches[i], false);
}
}
@@ -307,7 +307,7 @@ fd_bc_alloc_batch(struct fd_batch_cache *cache, struct fd_context *ctx, bool non
*/
mtx_unlock(&ctx->screen->lock);
DBG("%p: too many batches! flush forced!", flush_batch);
- fd_batch_flush(flush_batch, true, false);
+ fd_batch_flush(flush_batch, true);
mtx_lock(&ctx->screen->lock);
/* While the resources get cleaned up automatically, the flush_batch
diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c
index c30bfe44dd5..ad03ac30fb8 100644
--- a/src/gallium/drivers/freedreno/freedreno_context.c
+++ b/src/gallium/drivers/freedreno/freedreno_context.c
@@ -69,7 +69,7 @@ fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fencep,
batch->needs_out_fence_fd = true;
if (!ctx->screen->reorder) {
- fd_batch_flush(batch, true, false);
+ fd_batch_flush(batch, true);
} else if (flags & PIPE_FLUSH_DEFERRED) {
fd_bc_flush_deferred(&ctx->screen->batch_cache, ctx);
} else {
diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c
index 2908ac52c9c..2bb19d37d4e 100644
--- a/src/gallium/drivers/freedreno/freedreno_draw.c
+++ b/src/gallium/drivers/freedreno/freedreno_draw.c
@@ -457,7 +457,7 @@ fd_launch_grid(struct pipe_context *pctx, const struct pipe_grid_info *info)
batch->needs_flush = true;
ctx->launch_grid(ctx, info);
- fd_batch_flush(batch, false, false);
+ fd_batch_flush(batch, false);
fd_batch_reference(&ctx->batch, save_batch);
fd_context_all_dirty(ctx);
diff --git a/src/gallium/drivers/freedreno/freedreno_fence.c b/src/gallium/drivers/freedreno/freedreno_fence.c
index 68bbb25ee64..940497bd495 100644
--- a/src/gallium/drivers/freedreno/freedreno_fence.c
+++ b/src/gallium/drivers/freedreno/freedreno_fence.c
@@ -48,7 +48,7 @@ struct pipe_fence_handle {
static void fence_flush(struct pipe_fence_handle *fence)
{
if (fence->batch)
- fd_batch_flush(fence->batch, true, true);
+ fd_batch_flush(fence->batch, true);
debug_assert(!fence->batch);
}
diff --git a/src/gallium/drivers/freedreno/freedreno_query_acc.c b/src/gallium/drivers/freedreno/freedreno_query_acc.c
index d7e1404fff8..7590fc1fbd7 100644
--- a/src/gallium/drivers/freedreno/freedreno_query_acc.c
+++ b/src/gallium/drivers/freedreno/freedreno_query_acc.c
@@ -139,7 +139,7 @@ fd_acc_get_query_result(struct fd_context *ctx, struct fd_query *q,
* spin forever:
*/
if (aq->no_wait_cnt++ > 5)
- fd_batch_flush(rsc->write_batch, false, false);
+ fd_batch_flush(rsc->write_batch, false);
return false;
}
@@ -152,7 +152,7 @@ fd_acc_get_query_result(struct fd_context *ctx, struct fd_query *q,
}
if (rsc->write_batch)
- fd_batch_flush(rsc->write_batch, true, false);
+ fd_batch_flush(rsc->write_batch, true);
/* get the result: */
fd_bo_cpu_prep(rsc->bo, ctx->pipe, DRM_FREEDRENO_PREP_READ);
diff --git a/src/gallium/drivers/freedreno/freedreno_query_hw.c b/src/gallium/drivers/freedreno/freedreno_query_hw.c
index 7c3da59394b..212451b0de4 100644
--- a/src/gallium/drivers/freedreno/freedreno_query_hw.c
+++ b/src/gallium/drivers/freedreno/freedreno_query_hw.c
@@ -209,7 +209,7 @@ fd_hw_get_query_result(struct fd_context *ctx, struct fd_query *q,
* spin forever:
*/
if (hq->no_wait_cnt++ > 5)
- fd_batch_flush(rsc->write_batch, false, false);
+ fd_batch_flush(rsc->write_batch, false);
return false;
}
@@ -237,7 +237,7 @@ fd_hw_get_query_result(struct fd_context *ctx, struct fd_query *q,
struct fd_resource *rsc = fd_resource(start->prsc);
if (rsc->write_batch)
- fd_batch_flush(rsc->write_batch, true, false);
+ fd_batch_flush(rsc->write_batch, true);
/* some piglit tests at least do query with no draws, I guess: */
if (!rsc->bo)
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 7b1b1bf43f8..e17a1e85d87 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -449,7 +449,7 @@ flush_resource(struct fd_context *ctx, struct fd_resource *rsc, unsigned usage)
mtx_unlock(&ctx->screen->lock);
foreach_batch(batch, &ctx->screen->batch_cache, batch_mask)
- fd_batch_flush(batch, false, false);
+ fd_batch_flush(batch, false);
foreach_batch(batch, &ctx->screen->batch_cache, batch_mask) {
fd_batch_sync(batch);
@@ -457,7 +457,7 @@ flush_resource(struct fd_context *ctx, struct fd_resource *rsc, unsigned usage)
}
assert(rsc->batch_mask == 0);
} else if (write_batch) {
- fd_batch_flush(write_batch, true, false);
+ fd_batch_flush(write_batch, true);
}
fd_batch_reference(&write_batch, NULL);
diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 238efd44899..e8ea6b0023d 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -248,14 +248,14 @@ fd_set_framebuffer_state(struct pipe_context *pctx,
* multiple times to the same surface), so we might as
* well go ahead and flush this one:
*/
- fd_batch_flush(old_batch, false, false);
+ fd_batch_flush(old_batch, false);
}
fd_batch_reference(&old_batch, NULL);
} else {
DBG("%d: cbufs[0]=%p, zsbuf=%p", ctx->batch->needs_flush,
framebuffer->cbufs[0], framebuffer->zsbuf);
- fd_batch_flush(ctx->batch, false, false);
+ fd_batch_flush(ctx->batch, false);
util_copy_framebuffer_state(&ctx->batch->framebuffer, cso);
}
More information about the mesa-commit
mailing list