From 659916d6742c561edb8c32b0dab5771f5f7ef34f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 28 Jan 2021 16:50:34 -0800 Subject: [PATCH] freedreno/a5xx: Don't forget to count our custom blits against queries. Noticed when comparing the a5xx and a6xx paths. Part-of: --- src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c index 53fbb77b092..3905e35408a 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c @@ -442,6 +442,8 @@ fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info) batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, true); + fd_batch_update_queries(batch); + emit_setup(batch->draw); if ((info->src.resource->target == PIPE_BUFFER) && @@ -462,6 +464,11 @@ fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info) fd_batch_flush(batch); fd_batch_reference(&batch, NULL); + /* Acc query state will have been dirtied by our fd_batch_update_queries, so + * the ctx->batch may need to turn its queries back on. + */ + ctx->update_active_queries = true; + return true; }