From 6e361edbbcf3a138609b7c0e5fec7c3c9a924df5 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 17 Apr 2021 13:41:10 +0200 Subject: [PATCH] android: panfrost/lib: add pan_cs.c to Makefile.sources Fixes the following building errors: FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/gallium_dri_intermediates/LINKED/gallium_dri.so ... ld.lld: error: undefined symbol: pan_emit_tls >>> referenced by pan_cmdstream.c:2279 (external/mesa/src/gallium/drivers/panfrost/pan_cmdstream.c:2279) ... ld.lld: error: undefined symbol: pan_emit_fbd >>> referenced by pan_cmdstream.c:2302 (external/mesa/src/gallium/drivers/panfrost/pan_cmdstream.c:2302) ... ld.lld: error: undefined symbol: pan_emit_fragment_job >>> referenced by pan_cmdstream.c:2382 (external/mesa/src/gallium/drivers/panfrost/pan_cmdstream.c:2382) ... ld.lld: error: undefined symbol: pan_emit_bifrost_tiler_heap >>> referenced by pan_job.c:718 (external/mesa/src/gallium/drivers/panfrost/pan_job.c:718) ... ld.lld: error: undefined symbol: pan_emit_bifrost_tiler >>> referenced by pan_job.c:723 (external/mesa/src/gallium/drivers/panfrost/pan_job.c:723) ... ld.lld: error: undefined symbol: pan_fbd_has_zs_crc_ext >>> referenced by pan_job.c:893 (external/mesa/src/gallium/drivers/panfrost/pan_job.c:893) ... clang-9: error: linker command failed with exit code 1 (use -v to see invocation) Cc: 21.1 Fixes: 387f8c037d38 ("panfrost: Add various helpers to simplify FB desc emission") Reviewed-by: Boris Brezillon . Part-of: (cherry picked from commit 63c2dfe132452a7da7471d62e7ff91109ef61597) --- .pick_status.json | 2 +- src/panfrost/Makefile.sources | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6d772f22cb0..8240dd2b319 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -715,7 +715,7 @@ "description": "android: panfrost/lib: add pan_cs.c to Makefile.sources", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "387f8c037d382877cc1379a7fb4524907bc4c088" }, diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index a520cc3f0ac..2f55e07db6a 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -37,6 +37,8 @@ lib_FILES := \ lib/pan_blend.h \ lib/pan_blitter.c \ lib/pan_blitter.h \ + lib/pan_cs.c \ + lib/pan_cs.h \ lib/pan_device.h \ lib/pan_encoder.h \ lib/pan_format.c \