From 9b7500dff03f8e44bcca345222486c953bdf8fcb Mon Sep 17 00:00:00 2001 From: Eric Anholt 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: (cherry picked from commit eabee821e9d7b1529301e7418dfda0f7e030e84b) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/meson.build | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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,