diff --git a/src/gallium/drivers/panfrost/pan_csf.c b/src/gallium/drivers/panfrost/pan_csf.c
index 7af8c8272da..2058134b840 100644
--- a/src/gallium/drivers/panfrost/pan_csf.c
+++ b/src/gallium/drivers/panfrost/pan_csf.c
@@ -1210,8 +1210,8 @@ csf_emit_draw_state(struct panfrost_batch *batch,
             ctx->blend->base.alpha_to_coverage,
             ctx->depth_stencil->zs_always_passes);
 
-         cfg.pixel_kill_operation = earlyzs.kill;
-         cfg.zs_update_operation = earlyzs.update;
+         cfg.pixel_kill_operation = (enum mali_pixel_kill)earlyzs.kill;
+         cfg.zs_update_operation = (enum mali_pixel_kill)earlyzs.update;
 
          cfg.allow_forward_pixel_to_kill =
             pan_allow_forward_pixel_to_kill(ctx, fs);
@@ -1491,7 +1491,6 @@ GENX(csf_init_context)(struct panfrost_context *ctx)
    const struct cs_builder_conf bconf = {
       .nr_registers = csif_info->cs_reg_count,
       .nr_kernel_registers = MAX2(csif_info->unpreserved_cs_reg_count, 4),
-      .nr_kernel_registers = 4,
    };
    struct cs_builder b;
    cs_builder_init(&b, &bconf, init_buffer);
diff --git a/src/panfrost/lib/genxml/cs_builder.h b/src/panfrost/lib/genxml/cs_builder.h
index a05e6789b4e..cb1fab1f651 100644
--- a/src/panfrost/lib/genxml/cs_builder.h
+++ b/src/panfrost/lib/genxml/cs_builder.h
@@ -1590,7 +1590,7 @@ cs_trace_point(struct cs_builder *b, struct cs_index regs,
 {
    cs_emit(b, TRACE_POINT, I) {
       I.base_register =
-         cs_src_tuple(b, regs, regs.size, BITFIELD_MASK(regs.size));
+         cs_src_tuple(b, regs, regs.size, (uint16_t)BITFIELD_MASK(regs.size));
       I.register_count = regs.size;
       cs_apply_async(I, async);
    }
diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
index 3574369df95..db07997c0f1 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
@@ -1513,8 +1513,8 @@ prepare_dcd(struct panvk_cmd_buffer *cmdbuf)
                pan_earlyzs_get(pan_earlyzs_analyze(&fs->info), writes_zs || oq,
                                alpha_to_coverage, zs_always_passes);
 
-            cfg.pixel_kill_operation = earlyzs.kill;
-            cfg.zs_update_operation = earlyzs.update;
+            cfg.pixel_kill_operation = (enum mali_pixel_kill)earlyzs.kill;
+            cfg.zs_update_operation = (enum mali_pixel_kill)earlyzs.update;
             cfg.evaluate_per_sample = fs->info.fs.sample_shading &&
                                       (dyns->ms.rasterization_samples > 1);