diff --git a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
index daa4ab664b7..bd1f53d6552 100644
--- a/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
+++ b/src/gallium/drivers/panfrost/ci/traces-panfrost.yml
@@ -170,7 +170,7 @@ traces:
   - path: glmark2/terrain.rdc
     expectations:
       - device: gl-panfrost-t860
-        checksum: 2264a06895a84154bd2f54abffcc48d8
+        checksum: 3f2856f8c77c4e583b11c71d666f8724
   - path: glmark2/texture-texture-filter=linear.rdc
     expectations:
       - device: gl-panfrost-t860
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index d20ecf042b2..ed1266bbc1d 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -166,6 +166,7 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         case PIPE_CAP_CS_DERIVED_SYSTEM_VALUES_SUPPORTED:
         case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
         case PIPE_CAP_TEXTURE_BUFFER_SAMPLER:
+        case PIPE_CAP_PACKED_UNIFORMS:
                 return 1;
 
         /* We need this for OES_copy_image, but currently there are some awful
diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index e00967d503e..0cd0e96044b 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -338,7 +338,7 @@ optimise_nir(nir_shader *nir, unsigned quirks, bool is_blend)
          * to UBO ordinarily, but it isn't as aggressive as we need. */
 
         NIR_PASS(progress, nir, nir_opt_peephole_select, 64, false, true);
-        NIR_PASS_V(nir, nir_lower_uniforms_to_ubo, false, false);
+        NIR_PASS_V(nir, nir_lower_uniforms_to_ubo, true, false);
 
         do {
                 progress = false;