summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2024-07-16 12:54:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-07-18 17:21:39 +0100
commitf5dc573c16bcbfa81a16097cd98980b4e59ef313 (patch)
tree45c044a9d01690d8bf11aab3f312f4ae99ed7133 /meta/recipes-graphics/mesa
parentb5a6692810c67b71ca24fbe94127a65343eeb7f9 (diff)
downloadpoky-f5dc573c16bcbfa81a16097cd98980b4e59ef313.tar.gz
mesa: fix QA warnings caused by freedreno tools
Fix following QA warnings / errors File /usr/bin/afuc-asm in package mesa-tools contains reference to TMPDIR [buildpaths] File /usr/bin/afuc-disasm in package mesa-tools contains reference to TMPDIR [buildpaths] (From OE-Core rev: 9f6e75ea571a04b3433bec7591996646a34fae88) Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa')
-rw-r--r--meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch78
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc1
2 files changed, 79 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
new file mode 100644
index 0000000000..5975ab4472
--- /dev/null
+++ b/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch
@@ -0,0 +1,78 @@
1From 027ac36756cc75eea9ed4fee135a351af30b35fd Mon Sep 17 00:00:00 2001
2From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
3Date: Tue, 16 Jul 2024 12:32:47 +0300
4Subject: [PATCH] freedreno: don't encode build path into binaries
5
6Encoding build-specific path into installed binaries is generally
7frowned upon. It harms the reproducibility of the build and e.g.
8OpenEmbedded now considers that to be an error.
9
10Instead of hardcoding rnn_src_path into the RNN_DEF_PATH define specify
11it manually when running the tests.
12
13Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30206]
14Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
15---
16 src/freedreno/afuc/meson.build | 4 ++++
17 src/freedreno/decode/meson.build | 4 +++-
18 src/freedreno/meson.build | 2 +-
19 3 files changed, 8 insertions(+), 2 deletions(-)
20
21diff --git a/src/freedreno/afuc/meson.build b/src/freedreno/afuc/meson.build
22index bb7cebf5a748..351cc31ef2de 100644
23--- a/src/freedreno/afuc/meson.build
24+++ b/src/freedreno/afuc/meson.build
25@@ -56,6 +56,7 @@ if with_tests
26 asm_fw = custom_target('afuc_test.fw',
27 output: 'afuc_test.fw',
28 command: [asm, '-g', '6', files('../.gitlab-ci/traces/afuc_test.asm'), '@OUTPUT@'],
29+ env: {'RNN_PATH': rnn_src_path},
30 )
31 test('afuc-asm',
32 diff,
33@@ -120,6 +122,7 @@ if cc.sizeof('size_t') > 4
34 disasm_fw = custom_target('afuc_test.asm',
35 output: 'afuc_test.asm',
36 command: [disasm, '-u', files('../.gitlab-ci/reference/afuc_test.fw'), '-g', '630'],
37+ env: {'RNN_PATH': rnn_src_path},
38 capture: true
39 )
40 test('afuc-disasm',
41diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build
42index 469eeb4eb597..dfa1c12d0d9f 100644
43--- a/src/freedreno/decode/meson.build
44+++ b/src/freedreno/decode/meson.build
45@@ -194,6 +194,7 @@ if dep_lua.found() and dep_libarchive.found()
46 log = custom_target(name + '.log',
47 output: name + '.log',
48 command: [cffdump, '--unit-test', args, files('../.gitlab-ci/traces/' + name + '.rd.gz')],
49+ env: {'RNN_PATH': rnn_src_path},
50 capture: true,
51 )
52 test('cffdump-' + name,
53@@ -247,7 +248,8 @@ if with_tests
54 output: name + '.log',
55 command: [crashdec, args, files('../.gitlab-ci/traces/' + name + '.devcore')],
56 capture: true,
57- env: {'GALLIUM_DUMP_CPU': 'false'},
58+ env: {'GALLIUM_DUMP_CPU': 'false',
59+ 'RNN_PATH': rnn_src_path},
60 )
61
62 test('crashdec-' + name,
63diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
64index 98e49b8fcf0e..145e72597eb9 100644
65--- a/src/freedreno/meson.build
66+++ b/src/freedreno/meson.build
67@@ -6,7 +6,7 @@ inc_freedreno_rnn = include_directories('rnn')
68
69 rnn_src_path = dir_source_root + '/src/freedreno/registers'
70 rnn_install_path = get_option('datadir') + '/freedreno/registers'
71-rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path
72+rnn_path = get_option('prefix') + '/' + rnn_install_path
73
74 dep_lua = dependency('lua54', 'lua53', 'lua52', 'lua', required: false,
75 allow_fallback: true, version: '>=5.2')
76--
772.39.2
78
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index c426e8fddd..973b762135 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -20,6 +20,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
20 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ 20 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
21 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ 21 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \
22 file://0001-amd-Include-missing-llvm-IR-header-Module.h.patch \ 22 file://0001-amd-Include-missing-llvm-IR-header-Module.h.patch \
23 file://0001-freedreno-don-t-encode-build-path-into-binaries.patch\
23" 24"
24 25
25SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a" 26SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a"