diff --git a/src/panfrost/.clang-format b/src/panfrost/.clang-format
index 4766dd01180..1a69d5be020 100644
--- a/src/panfrost/.clang-format
+++ b/src/panfrost/.clang-format
@@ -36,7 +36,9 @@ ForEachMacros: [
   'bi_foreach_ssa_dest',
   'bi_foreach_ssa_src',
   'bi_foreach_successor',
+  'cs_break',
   'cs_case',
+  'cs_continue',
   'cs_default',
   'cs_emit',
   'cs_match',
diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h
index 0dc7c6d060f..e6fdd960b22 100644
--- a/src/panfrost/lib/genxml/cs_builder.h
+++ b/src/panfrost/lib/genxml/cs_builder.h
@@ -833,35 +833,27 @@ cs_while_start(struct cs_builder *b, struct cs_loop *loop,
 }
 
 static inline void
-cs_loop_continue(struct cs_builder *b, enum mali_cs_condition cond,
-                 struct cs_index val)
+cs_loop_conditional_continue(struct cs_builder *b, struct cs_loop *loop,
+                             enum mali_cs_condition cond, struct cs_index val)
 {
-   assert(b->blocks.cur);
-
-   struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
-
+   assert(b->blocks.cur == &loop->block);
    cs_branch_label(b, &loop->start, cond, val);
    cs_loop_diverge_ls_update(b, loop);
 }
 
 static inline void
-cs_loop_break(struct cs_builder *b, enum mali_cs_condition cond,
-              struct cs_index val)
+cs_loop_conditional_break(struct cs_builder *b, struct cs_loop *loop,
+                          enum mali_cs_condition cond, struct cs_index val)
 {
-   assert(b->blocks.cur);
-
-   struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
-
+   assert(b->blocks.cur == &loop->block);
    cs_branch_label(b, &loop->end, cond, val);
    cs_loop_diverge_ls_update(b, loop);
 }
 
 static inline void
-cs_while_end(struct cs_builder *b)
+cs_while_end(struct cs_builder *b, struct cs_loop *loop)
 {
-   assert(b->blocks.cur);
-
-   struct cs_loop *loop = container_of(b->blocks.cur, struct cs_loop, block);
+   assert(b->blocks.cur == &loop->block);
 
    cs_branch_label(b, &loop->start, loop->cond, loop->val);
    cs_set_label(b, &loop->end);
@@ -878,10 +870,17 @@ cs_while_end(struct cs_builder *b)
    }
 }
 
-#define cs_while(__b, cond, val)                                               \
+#define cs_while(__b, __cond, __val)                                           \
    for (struct cs_loop __loop_storage,                                         \
-        *__loop = cs_while_start(__b, &__loop_storage, cond, val);             \
-        __loop != NULL; cs_while_end(__b), __loop = NULL)
+        *__loop = cs_while_start(__b, &__loop_storage, __cond, __val);         \
+        __loop != NULL; cs_while_end(__b, __loop), __loop = NULL)
+
+#define cs_continue(__b)                                                       \
+   cs_loop_conditional_continue(__b, __loop, MALI_CS_CONDITION_ALWAYS,         \
+                                cs_undef())
+
+#define cs_break(__b)                                                          \
+   cs_loop_conditional_break(__b, __loop, MALI_CS_CONDITION_ALWAYS, cs_undef())
 
 /* Pseudoinstructions follow */
 
diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
index 1ebc24a1195..aa5e1fe21b4 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
@@ -643,7 +643,7 @@ cs_render_desc_ringbuf_move_ptr(struct cs_builder *b, uint32_t size)
    cs_while(b, MALI_CS_CONDITION_GEQUAL, scratch_reg) {
       cs_add32(b, ptr_lo, ptr_lo, -RENDER_DESC_RINGBUF_SIZE);
       cs_add32(b, pos, pos, -RENDER_DESC_RINGBUF_SIZE);
-      cs_loop_break(b, MALI_CS_CONDITION_ALWAYS, cs_undef());
+      cs_break(b);
    }
 
    cs_store(