From b8c4ad378d22988cbb20743dc74d377b5d6ac7ed Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Mon, 20 Sep 2021 11:11:30 -0700 Subject: [PATCH] freedreno: Fix autotune regression since batch-cache rework. I freed the key that autotune needed a little early. Fixes: b2349a46715e ("freedreno: Move the batch cache to the context.") Part-of: --- src/gallium/drivers/freedreno/freedreno_batch.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c index df6ea640d1b..a7cb906b861 100644 --- a/src/gallium/drivers/freedreno/freedreno_batch.c +++ b/src/gallium/drivers/freedreno/freedreno_batch.c @@ -341,7 +341,6 @@ batch_flush(struct fd_batch *batch) assert_dt batch_flush_dependencies(batch); batch_reset_resources(batch); - fd_bc_free_key(batch); batch->flushed = true; if (batch == batch->ctx->batch) @@ -354,6 +353,9 @@ batch_flush(struct fd_batch *batch) assert_dt debug_assert(batch->reference.count > 0); + /* Must come after fd_gmem_render_tiles, since that uses the key. */ + fd_bc_free_key(batch); + cleanup_submit(batch); fd_batch_unlock_submit(batch); }