From eabee821e9d7b1529301e7418dfda0f7e030e84b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 15 Feb 2021 10:36:49 -0800
Subject: [PATCH] freedreno: Add missing dep on freedreno tracepoints.

We were only get guaranteed that libfreedreno (and thus the tracepoints
generation) was ready when we linked, not when we compiled the gmemtool.c
that also used it.

Fixes: a02dcb970fff ("freedreno: Add GPU tracepoints")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9056>
---
 src/gallium/drivers/freedreno/meson.build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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,