From 5b9fe184854f4026fb70d90fd6fee82bc72c2c0e Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Tue, 21 Jan 2020 16:15:28 -0800 Subject: [PATCH] freedreno: remove flush-queue Signed-off-by: Rob Clark Tested-by: Marge Bot Part-of: --- .../drivers/freedreno/a5xx/fd5_blitter.c | 2 +- .../drivers/freedreno/a6xx/fd6_blitter.c | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 2 +- .../drivers/freedreno/freedreno_batch.c | 63 +++---------------- .../drivers/freedreno/freedreno_batch.h | 5 +- .../drivers/freedreno/freedreno_batch_cache.c | 4 +- .../drivers/freedreno/freedreno_context.c | 5 +- .../drivers/freedreno/freedreno_context.h | 2 - .../drivers/freedreno/freedreno_draw.c | 2 +- .../drivers/freedreno/freedreno_fence.c | 2 +- .../drivers/freedreno/freedreno_query_acc.c | 4 +- .../drivers/freedreno/freedreno_query_hw.c | 4 +- .../drivers/freedreno/freedreno_resource.c | 20 +----- .../drivers/freedreno/freedreno_state.c | 4 +- 14 files changed, 24 insertions(+), 97 deletions(-) diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c index b5765263ce5..cffcae86a8b 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c @@ -479,7 +479,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); + fd_batch_flush(batch); 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 c1967284258..f812aab37a6 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c @@ -668,7 +668,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); + fd_batch_flush(batch); fd_batch_reference(&batch, NULL); return true; diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c index 28388bfb8a2..b6f1d5f2281 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c @@ -1432,7 +1432,7 @@ emit_sysmem_clears(struct fd_batch *batch, struct fd_ringbuffer *ring) } } - fd6_event_write(batch, ring, 0x1d, true); + fd6_event_write(batch, ring, UNK_1D, true); } static void diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index f0dd8148229..dc8e1791513 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -41,9 +41,6 @@ batch_init(struct fd_batch *batch) struct fd_context *ctx = batch->ctx; unsigned size = 0; - if (ctx->screen->reorder) - util_queue_fence_init(&batch->flush_fence); - /* if kernel is too old to support unlimited # of cmd buffers, we * have no option but to allocate large worst-case sizes so that * we don't need to grow the ringbuffer. Performance is likely to @@ -191,9 +188,6 @@ batch_fini(struct fd_batch *batch) fd_hw_sample_reference(batch->ctx, &samp, NULL); } util_dynarray_fini(&batch->samples); - - if (batch->ctx->screen->reorder) - util_queue_fence_destroy(&batch->flush_fence); } static void @@ -204,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); + fd_batch_flush(dep); fd_batch_reference(&dep, NULL); } @@ -239,8 +233,6 @@ batch_reset(struct fd_batch *batch) { DBG("%p", batch); - fd_batch_sync(batch); - batch_flush_reset_dependencies(batch, false); batch_reset_resources(batch); @@ -286,32 +278,6 @@ __fd_batch_describe(char* buf, const struct fd_batch *batch) sprintf(buf, "fd_batch<%u>", batch->seqno); } -void -fd_batch_sync(struct fd_batch *batch) -{ - if (!batch->ctx->screen->reorder) - return; - util_queue_fence_wait(&batch->flush_fence); -} - -static void -batch_flush_func(void *job, int id) -{ - struct fd_batch *batch = job; - - DBG("%p", batch); - - fd_gmem_render_tiles(batch); - batch_reset_resources(batch); -} - -static void -batch_cleanup_func(void *job, int id) -{ - struct fd_batch *batch = job; - fd_batch_reference(&batch, NULL); -} - static void batch_flush(struct fd_batch *batch) { @@ -333,20 +299,8 @@ batch_flush(struct fd_batch *batch) fd_fence_ref(&batch->ctx->last_fence, batch->fence); - if (batch->ctx->screen->reorder) { - struct fd_batch *tmp = NULL; - fd_batch_reference(&tmp, batch); - - if (!util_queue_is_initialized(&batch->ctx->flush_queue)) - util_queue_init(&batch->ctx->flush_queue, "flush_queue", 16, 1, 0); - - util_queue_add_job(&batch->ctx->flush_queue, - batch, &batch->flush_fence, - batch_flush_func, batch_cleanup_func, 0); - } else { - fd_gmem_render_tiles(batch); - batch_reset_resources(batch); - } + fd_gmem_render_tiles(batch); + batch_reset_resources(batch); debug_assert(batch->reference.count > 0); @@ -364,7 +318,7 @@ batch_flush(struct fd_batch *batch) * a fence to sync on */ void -fd_batch_flush(struct fd_batch *batch, bool sync) +fd_batch_flush(struct fd_batch *batch) { struct fd_batch *tmp = NULL; bool newbatch = false; @@ -401,9 +355,6 @@ fd_batch_flush(struct fd_batch *batch, bool sync) fd_context_all_dirty(ctx); } - if (sync) - fd_batch_sync(tmp); - fd_batch_reference(&tmp, NULL); } @@ -445,7 +396,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); + fd_batch_flush(b); mtx_lock(&b->ctx->screen->lock); fd_bc_invalidate_batch(b, false); @@ -519,7 +470,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); + fd_batch_flush(batch); return; } @@ -528,7 +479,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); + fd_batch_flush(batch); } /* 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 9d6defc7564..a3bdfda1077 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.h +++ b/src/gallium/drivers/freedreno/freedreno_batch.h @@ -74,8 +74,6 @@ struct fd_batch { struct fd_context *ctx; - struct util_queue_fence flush_fence; - /* do we need to mem2gmem before rendering. We don't, if for example, * there was a glClear() that invalidated the entire previous buffer * contents. Keep track of which buffer(s) are cleared, or needs @@ -247,8 +245,7 @@ struct fd_batch { 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); +void fd_batch_flush(struct fd_batch *batch); 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 82b285c9c6b..ec1d1acf9b3 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); + fd_batch_flush(batches[i]); } } @@ -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); + fd_batch_flush(flush_batch); 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 47b7a27ad1f..e396d61c6cb 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -75,7 +75,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); + fd_batch_flush(batch); } else if (flags & PIPE_FLUSH_DEFERRED) { fd_bc_flush_deferred(&ctx->screen->batch_cache, ctx); } else { @@ -170,9 +170,6 @@ fd_context_destroy(struct pipe_context *pctx) fd_fence_ref(&ctx->last_fence, NULL); - if (ctx->screen->reorder && util_queue_is_initialized(&ctx->flush_queue)) - util_queue_destroy(&ctx->flush_queue); - util_copy_framebuffer_state(&ctx->framebuffer, NULL); fd_batch_reference(&ctx->batch, NULL); /* unref current batch */ fd_bc_invalidate_context(ctx); diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index 80f2462fdd9..f92790c0ecf 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -173,8 +173,6 @@ struct fd_context { struct fd_screen *screen; struct fd_pipe *pipe; - struct util_queue flush_queue; - struct blitter_context *blitter; void *clear_rs_state; struct primconvert_context *primconvert; diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index a4724221b12..94e2aae9e68 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -464,7 +464,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); + fd_batch_flush(batch); 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 9d49f10ed94..71472da704a 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); + fd_batch_flush(fence->batch); 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 49c71c4b644..89282f28966 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); + fd_batch_flush(rsc->write_batch); 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); + fd_batch_flush(rsc->write_batch); /* 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 f1d22328df8..bed59a53ab2 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); + fd_batch_flush(rsc->write_batch); 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); + fd_batch_flush(rsc->write_batch); /* 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 d1df32cab9a..2e15bbadea1 100644 --- a/src/gallium/drivers/freedreno/freedreno_resource.c +++ b/src/gallium/drivers/freedreno/freedreno_resource.c @@ -450,15 +450,14 @@ 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); + fd_batch_flush(batch); foreach_batch(batch, &ctx->screen->batch_cache, batch_mask) { - fd_batch_sync(batch); fd_batch_reference(&batches[batch->idx], NULL); } assert(rsc->batch_mask == 0); } else if (write_batch) { - fd_batch_flush(write_batch, true); + fd_batch_flush(write_batch); } fd_batch_reference(&write_batch, NULL); @@ -560,21 +559,6 @@ fd_resource_transfer_map(struct pipe_context *pctx, if (usage & PIPE_TRANSFER_READ) { fd_blit_to_staging(ctx, trans); - struct fd_batch *batch = NULL; - - fd_context_lock(ctx); - fd_batch_reference_locked(&batch, staging_rsc->write_batch); - fd_context_unlock(ctx); - - /* we can't fd_bo_cpu_prep() until the blit to staging - * is submitted to kernel.. in that case write_batch - * wouldn't be NULL yet: - */ - if (batch) { - fd_batch_sync(batch); - fd_batch_reference(&batch, NULL); - } - fd_bo_cpu_prep(staging_rsc->bo, ctx->pipe, DRM_FREEDRENO_PREP_READ); } diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c index 4f315488d1b..a231441d314 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); + fd_batch_flush(old_batch); } 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); + fd_batch_flush(ctx->batch); util_copy_framebuffer_state(&ctx->batch->framebuffer, cso); } -- 2.30.2