From 93df18e88925abe31681f8d21520a8e506c7cf29 Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@chromium.org>
Date: Sat, 2 Oct 2021 11:16:13 -0700
Subject: [PATCH] Revert "freedreno: Fix autotune regression since batch-cache
 rework."

This reverts commit b8c4ad378d22988cbb20743dc74d377b5d6ac7ed.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13159>
---
 src/gallium/drivers/freedreno/freedreno_batch.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/drivers/freedreno/freedreno_batch.c b/src/gallium/drivers/freedreno/freedreno_batch.c
index a7cb906b861..df6ea640d1b 100644
--- a/src/gallium/drivers/freedreno/freedreno_batch.c
+++ b/src/gallium/drivers/freedreno/freedreno_batch.c
@@ -341,6 +341,7 @@ 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)
@@ -353,9 +354,6 @@ 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);
 }