diff --git a/.pick_status.json b/.pick_status.json
index ff78137d93d..f9c9c7d3d42 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1903,7 +1903,7 @@
         "description": "freedreno: Add missing dep on freedreno tracepoints.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a02dcb970fff17e73648b58bf4a603bc4f9c0c36"
     },
diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index b59f596f7c2..8143309e6d2 100644
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -215,7 +215,7 @@ files_libfreedreno = files(
   'ir3/ir3_gallium.h',
 )
 
-files_libfreedreno += custom_target(
+freedreno_tracepoints = custom_target(
   'freedreno_tracepoints.[ch]',
   input: 'freedreno_tracepoints.py',
   output: ['freedreno_tracepoints.c', 'freedreno_tracepoints.h'],
@@ -228,6 +228,8 @@ files_libfreedreno += custom_target(
   depend_files: u_trace_py,
 )
 
+files_libfreedreno += freedreno_tracepoints
+
 freedreno_includes = [
   inc_mesa, inc_mapi,
   inc_src, inc_include, inc_gallium, inc_gallium_aux,
@@ -296,7 +298,10 @@ ir3_compiler = executable(
 
 gmemtool = executable(
   'gmemtool',
-  'gmemtool.c',
+  [
+    'gmemtool.c',
+    freedreno_tracepoints[1]
+  ],
   include_directories : freedreno_includes,
   dependencies : [
     idep_nir,