diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
index 7a7f6fa4673..caa7e8b4135 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.cc
@@ -660,7 +660,7 @@ emit_conditional_ib(struct fd_batch *batch, const struct fd_tile *tile,
     * forces an unconditional IB (because we know there is something
     * to do for this tile)
     */
-   if (batch->fast_cleared || !use_hw_binning(batch)) {
+   if (batch->cleared || !use_hw_binning(batch)) {
       fd6_emit_ib(batch->gmem, target);
       return;
    }
diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index e5d6f4043e1..cda2fa09e7c 100644
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -493,7 +493,7 @@ gmem_key_init(struct fd_batch *batch, bool assume_zs, bool no_scis_opt)
        * u_blitter will show up as a normal draw with depth and/or
        * stencil enabled.
        */
-      unsigned zsclear = batch->fast_cleared & (FD_BUFFER_DEPTH | FD_BUFFER_STENCIL);
+      unsigned zsclear = batch->cleared & (FD_BUFFER_DEPTH | FD_BUFFER_STENCIL);
       if (zsclear) {
          const struct util_format_description *desc =
                util_format_description(pfb->zsbuf->format);
@@ -723,7 +723,7 @@ fd_gmem_render_tiles(struct fd_batch *batch)
    /* Sometimes we need to flush a batch just to get a fence, with no
     * clears or draws.. in this case promote to nondraw:
     */
-   if (!(batch->fast_cleared || batch->num_draws))
+   if (!(batch->cleared || batch->num_draws))
       sysmem = true;
 
    if (!batch->nondraw) {