diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c
index 199c51c78e3..b28d97b788c 100644
--- a/src/gallium/drivers/panfrost/pan_job.c
+++ b/src/gallium/drivers/panfrost/pan_job.c
@@ -806,6 +806,7 @@ panfrost_batch_submit(struct panfrost_context *ctx,
    struct pan_image_view rts[8], zs, s;
 
    panfrost_batch_to_fb_info(batch, &fb, rts, &zs, &s, false);
+   panfrost_emit_tile_map(batch, &fb);
 
    screen->vtbl.preload(batch, &fb);
    screen->vtbl.init_polygon_list(batch);
@@ -814,7 +815,6 @@ panfrost_batch_submit(struct panfrost_context *ctx,
     * FBD for the batch (if there is one). */
 
    screen->vtbl.emit_tls(batch);
-   panfrost_emit_tile_map(batch, &fb);
 
    if (has_frag) {
       screen->vtbl.emit_fbd(batch, &fb);