diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index bb5a091e3d4..20c50f0471f 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -221,10 +221,6 @@ spec@arb_gpu_shader_fp64@execution@built-in-functions@fs-inverse-dmat4,Fail
 spec@arb_gpu_shader_fp64@uniform_buffers@fs-ubo-load.indirect.3,Fail
 spec@glsl-4.00@execution@built-in-functions@fs-op-div-double-dmat4,Fail
 
-# Regression from https://gitlab.freedesktop.org/mesa/mesa/-/compare/fc7badeac09f88ba4fe204cba79cde5bee64c986...384bf8e58ed5e149e157c91bc934482fbb0151c8
-spec@arb_shader_clock@execution@clock,Fail
-spec@arb_shader_clock@execution@clock2x32,Fail
-
 # uprev Piglit in Mesa
 spec@glsl-1.30@execution@fs-uint-to-float-of-extract-int16,Fail
 spec@glsl-1.30@execution@fs-uint-to-float-of-extract-int8,Fail
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 13a084f2a4c..009cb67a926 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -918,8 +918,11 @@ fd_screen_create(int fd,
    if (fd_device_version(dev) >= FD_VERSION_ROBUSTNESS)
       screen->has_robustness = true;
 
-   if (fd_pipe_get_param(screen->pipe, FD_UCHE_TRAP_BASE, &val))
+   if (fd_pipe_get_param(screen->pipe, FD_UCHE_TRAP_BASE, &val)) {
       screen->uche_trap_base = screen->gen >= 6 ? 0x1fffffffff000ull : 0ull;
+   } else {
+      screen->uche_trap_base = val;
+   }
 
    screen->has_syncobj = fd_has_syncobj(screen->dev);