diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files')
2 files changed, 0 insertions, 134 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 deleted file mode 100644 index 136ed8623b..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-freedreno-don-t-encode-build-path-into-binaries.patch +++ /dev/null | |||
| @@ -1,110 +0,0 @@ | |||
| 1 | From 027ac36756cc75eea9ed4fee135a351af30b35fd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | ||
| 3 | Date: Tue, 16 Jul 2024 12:32:47 +0300 | ||
| 4 | Subject: [PATCH] freedreno: don't encode build path into binaries | ||
| 5 | |||
| 6 | Encoding build-specific path into installed binaries is generally | ||
| 7 | frowned upon. It harms the reproducibility of the build and e.g. | ||
| 8 | OpenEmbedded now considers that to be an error. | ||
| 9 | |||
| 10 | Instead of hardcoding rnn_src_path into the RNN_DEF_PATH define specify | ||
| 11 | it manually when running the tests. | ||
| 12 | |||
| 13 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30206] | ||
| 14 | Signed-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 | |||
| 21 | diff --git a/src/freedreno/afuc/meson.build b/src/freedreno/afuc/meson.build | ||
| 22 | index bb7cebf5a748..351cc31ef2de 100644 | ||
| 23 | --- a/src/freedreno/afuc/meson.build | ||
| 24 | +++ b/src/freedreno/afuc/meson.build | ||
| 25 | @@ -56,10 +56,12 @@ if with_tests | ||
| 26 | asm_fw = custom_target('afuc_test.fw', | ||
| 27 | output: 'afuc_test.fw', | ||
| 28 | command: [asm, files('../tests/traces/afuc_test.asm'), '@OUTPUT@'], | ||
| 29 | + env: {'RNN_PATH': rnn_src_path}, | ||
| 30 | ) | ||
| 31 | asm_fw_a7xx = custom_target('afuc_test_a7xx.fw', | ||
| 32 | output: 'afuc_test_a7xx.fw', | ||
| 33 | command: [asm, files('../tests/traces/afuc_test_a7xx.asm'), '@OUTPUT@'], | ||
| 34 | + env: {'RNN_PATH': rnn_src_path}, | ||
| 35 | ) | ||
| 36 | test('afuc-asm', | ||
| 37 | diff, | ||
| 38 | @@ -120,11 +122,13 @@ if cc.sizeof('size_t') > 4 | ||
| 39 | disasm_fw = custom_target('afuc_test.asm', | ||
| 40 | output: 'afuc_test.asm', | ||
| 41 | command: [disasm, '-u', files('../tests/reference/afuc_test.fw')], | ||
| 42 | + env: {'RNN_PATH': rnn_src_path}, | ||
| 43 | capture: true | ||
| 44 | ) | ||
| 45 | disasm_fw_a7xx = custom_target('afuc_test_a7xx.asm', | ||
| 46 | output: 'afuc_test_a7xx.asm', | ||
| 47 | command: [disasm, '-u', files('../tests/reference/afuc_test_a7xx.fw')], | ||
| 48 | + env: {'RNN_PATH': rnn_src_path}, | ||
| 49 | capture: true | ||
| 50 | ) | ||
| 51 | test('afuc-disasm', | ||
| 52 | diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build | ||
| 53 | index 469eeb4eb597..dfa1c12d0d9f 100644 | ||
| 54 | --- a/src/freedreno/decode/meson.build | ||
| 55 | +++ b/src/freedreno/decode/meson.build | ||
| 56 | @@ -194,6 +194,7 @@ if dep_lua.found() and dep_libarchive.found() | ||
| 57 | log = custom_target(name + '.log', | ||
| 58 | output: name + '.log', | ||
| 59 | command: [cffdump, '--unit-test', args, files('../tests/traces/' + name + '.rd.gz')], | ||
| 60 | + env: {'RNN_PATH': rnn_src_path}, | ||
| 61 | capture: true, | ||
| 62 | ) | ||
| 63 | test('cffdump-' + name, | ||
| 64 | @@ -247,7 +248,8 @@ if with_tests | ||
| 65 | output: name + '.log', | ||
| 66 | command: [crashdec, args, files('../tests/traces/' + name + '.devcore')], | ||
| 67 | capture: true, | ||
| 68 | - env: {'GALLIUM_DUMP_CPU': 'false'}, | ||
| 69 | + env: {'GALLIUM_DUMP_CPU': 'false', | ||
| 70 | + 'RNN_PATH': rnn_src_path}, | ||
| 71 | ) | ||
| 72 | |||
| 73 | test('crashdec-' + name, | ||
| 74 | diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build | ||
| 75 | index 98e49b8fcf0e..145e72597eb9 100644 | ||
| 76 | --- a/src/freedreno/meson.build | ||
| 77 | +++ b/src/freedreno/meson.build | ||
| 78 | @@ -6,7 +6,7 @@ inc_freedreno_rnn = include_directories('rnn') | ||
| 79 | |||
| 80 | rnn_src_path = dir_source_root + '/src/freedreno/registers' | ||
| 81 | rnn_install_path = get_option('datadir') + '/freedreno/registers' | ||
| 82 | -rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path | ||
| 83 | +rnn_path = get_option('prefix') + '/' + rnn_install_path | ||
| 84 | |||
| 85 | dep_libarchive = dependency('libarchive', allow_fallback: true, required: false) | ||
| 86 | dep_libxml2 = dependency('libxml-2.0', allow_fallback: true, required: false) | ||
| 87 | diff --git a/src/freedreno/registers/gen_header.py b/src/freedreno/registers/gen_header.py | ||
| 88 | --- a/src/freedreno/registers/gen_header.py | ||
| 89 | +++ b/src/freedreno/registers/gen_header.py | ||
| 90 | @@ -885,13 +885,14 @@ The rules-ng-ng source files this header | ||
| 91 | """) | ||
| 92 | maxlen = 0 | ||
| 93 | for filepath in p.xml_files: | ||
| 94 | - maxlen = max(maxlen, len(filepath)) | ||
| 95 | + maxlen = max(maxlen, len(os.path.basename(filepath))) | ||
| 96 | for filepath in p.xml_files: | ||
| 97 | - pad = " " * (maxlen - len(filepath)) | ||
| 98 | + filename = os.path.basename(filepath) | ||
| 99 | + pad = " " * (maxlen - len(filename)) | ||
| 100 | filesize = str(os.path.getsize(filepath)) | ||
| 101 | filesize = " " * (7 - len(filesize)) + filesize | ||
| 102 | filetime = time.ctime(os.path.getmtime(filepath)) | ||
| 103 | - print("- " + filepath + pad + " (" + filesize + " bytes, from " + filetime + ")") | ||
| 104 | + print("- " + filename + pad + " (" + filesize + " bytes, from " + filetime + ")") | ||
| 105 | if p.copyright_year: | ||
| 106 | current_year = str(datetime.date.today().year) | ||
| 107 | print() | ||
| 108 | --- | ||
| 109 | 2.39.2 | ||
| 110 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch deleted file mode 100644 index baa98a0d46..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | From 02cc21800fe29f566add525e63f619c0536d6e7b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 13 Jan 2020 15:23:47 -0800 | ||
| 4 | Subject: [PATCH] meson misdetects 64bit atomics on mips/clang | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | src/util/u_atomic.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c | ||
| 13 | index 5a5eab4..e499516 100644 | ||
| 14 | --- a/src/util/u_atomic.c | ||
| 15 | +++ b/src/util/u_atomic.c | ||
| 16 | @@ -21,7 +21,7 @@ | ||
| 17 | * IN THE SOFTWARE. | ||
| 18 | */ | ||
| 19 | |||
| 20 | -#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) | ||
| 21 | +#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) | ||
| 22 | |||
| 23 | #include <stdint.h> | ||
| 24 | #include <pthread.h> | ||
