diff --git a/src/panfrost/vulkan/csf/panvk_vX_utrace.c b/src/panfrost/vulkan/csf/panvk_vX_utrace.c
index f63de48381f..412588f3894 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_utrace.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_utrace.c
@@ -5,6 +5,8 @@
 
 #include "panvk_utrace.h"
 
+#include "drm-uapi/panthor_drm.h"
+
 #include "genxml/cs_builder.h"
 #include "panvk_cmd_buffer.h"
 #include "panvk_device.h"
@@ -148,9 +150,11 @@ void
 panvk_per_arch(utrace_clone_init_builder)(struct cs_builder *b,
                                           struct panvk_pool *pool)
 {
+   const struct drm_panthor_csif_info *csif_info =
+      panthor_kmod_get_csif_props(pool->dev->kmod.dev);
    const struct cs_builder_conf builder_conf = {
-      .nr_registers = b->conf.nr_registers,
-      .nr_kernel_registers = b->conf.nr_kernel_registers,
+      .nr_registers = csif_info->cs_reg_count,
+      .nr_kernel_registers = MAX2(csif_info->unpreserved_cs_reg_count, 4),
       .alloc_buffer = alloc_clone_buffer,
       .cookie = pool,
    };