diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-03-16 10:41:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-22 14:47:29 +0000 |
commit | 506e22a311cfe1136e70eadc0f1f07933aca072c (patch) | |
tree | 1af43b8f7a5486dc169cac302180ae4929b6d3e1 /meta/recipes-graphics | |
parent | bcd0638d44ebfe17c7b2c32a520c5787662a4183 (diff) | |
download | poky-506e22a311cfe1136e70eadc0f1f07933aca072c.tar.gz |
mesa: update 22.3.5 -> 23.0.0
Drop patches:
0001-gbm-backend-fix-gbm-compile-without-dri.patch
0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
(backports)
0001-util-format-Check-for-NEON-before-using-it.patch
(upstream submission has stalled with unanswered concerns from upstream;
patch no longer applies; issue does not reproduce with 'raspberrypi0-wifi' MACHINE)
(From OE-Core rev: cdb5d1662bd9df5e9137a52187c94792d2d3247d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch | 44 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch | 65 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch | 47 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_23.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_23.0.0.bb (renamed from meta/recipes-graphics/mesa/mesa_22.3.5.bb) | 0 |
6 files changed, 1 insertions, 160 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch b/meta/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch deleted file mode 100644 index 3ab22889bf..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From 8a5de0b6cf1090d7f29f3974ec79c32776cf2745 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jami Kettunen <jami.kettunen@protonmail.com> | ||
3 | Date: Tue, 31 Aug 2021 00:15:58 +0300 | ||
4 | Subject: [PATCH] freedreno/pm4: Use unsigned instead of uint to fix musl build | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Fixes the following error I noticed when building against aarch64 with | ||
9 | musl libc: | ||
10 | |||
11 | In file included from ../src/freedreno/decode/crashdec.h:38, | ||
12 | from ../src/freedreno/decode/crashdec.c:40: | ||
13 | ../src/freedreno/common/freedreno_pm4.h:104:15: error: unknown type name 'uint' | ||
14 | 104 | static inline uint | ||
15 | | ^~~~ | ||
16 | ../src/freedreno/common/freedreno_pm4.h:105:25: error: unknown type name 'uint'; did you mean 'int'? | ||
17 | 105 | pm4_calc_odd_parity_bit(uint val) | ||
18 | | ^~~~ | ||
19 | | int | ||
20 | |||
21 | Signed-off-by: Jami Kettunen <jami.kettunen@protonmail.com> | ||
22 | Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19665> | ||
23 | --- | ||
24 | src/freedreno/common/freedreno_pm4.h | 4 ++-- | ||
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/src/freedreno/common/freedreno_pm4.h b/src/freedreno/common/freedreno_pm4.h | ||
28 | index 8f958953d693..091247e709a0 100644 | ||
29 | --- a/src/freedreno/common/freedreno_pm4.h | ||
30 | +++ b/src/freedreno/common/freedreno_pm4.h | ||
31 | @@ -105,8 +105,8 @@ pm4_pkt7_hdr(uint8_t opcode, uint16_t cnt) | ||
32 | #define cp_type3_opcode(pkt) (((pkt) >> 8) & 0xFF) | ||
33 | #define type3_pkt_size(pkt) ((((pkt) >> 16) & 0x3FFF) + 1) | ||
34 | |||
35 | -static inline uint | ||
36 | -pm4_calc_odd_parity_bit(uint val) | ||
37 | +static inline unsigned | ||
38 | +pm4_calc_odd_parity_bit(unsigned val) | ||
39 | { | ||
40 | return (0x9669 >> (0xf & ((val) ^ ((val) >> 4) ^ ((val) >> 8) ^ | ||
41 | ((val) >> 12) ^ ((val) >> 16) ^ ((val) >> 20) ^ | ||
42 | -- | ||
43 | 2.39.2 | ||
44 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch b/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch deleted file mode 100644 index 6541671b7a..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Davis Jr <vince@underview.tech> | ||
3 | Date: Wed, 28 Dec 2022 16:28:01 -0600 | ||
4 | Subject: [PATCH] gbm/backend: fix gbm compile without dri | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447 | ||
9 | https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60 | ||
10 | |||
11 | At mesa version 22.2.3 patch wasn't introduced until after. | ||
12 | |||
13 | Commit introduces a fix that allows for gbm to be built with an empty | ||
14 | backend. There are situation especially in a Yocto/OE cross compilation | ||
15 | environment where you want to build with an empty backend. The particular | ||
16 | situation is as such: | ||
17 | |||
18 | The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl, | ||
19 | virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build | ||
20 | errors such as: | ||
21 | |||
22 | | /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend': | ||
23 | | backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend' | ||
24 | | /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4): | ||
25 | undefined reference to `gbm_dri_backend' | ||
26 | | collect2: error: ld returned 1 exit status | ||
27 | |||
28 | Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled | ||
29 | |||
30 | Add fix to bypasses compilation issue by excluding gbm dri backend. If | ||
31 | HAVE_DRI || HAVE_DRIX not specified. | ||
32 | |||
33 | Acked-by: David Heidelberg <david.heidelberg@collabora.com> | ||
34 | Signed-off-by: Vincent Davis Jr <vince@underview.tech> | ||
35 | --- | ||
36 | src/gbm/main/backend.c | 4 ++++ | ||
37 | 1 file changed, 4 insertions(+) | ||
38 | |||
39 | diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c | ||
40 | index 974d0a76a4e..feee0703495 100644 | ||
41 | --- a/src/gbm/main/backend.c | ||
42 | +++ b/src/gbm/main/backend.c | ||
43 | @@ -42,7 +42,9 @@ | ||
44 | #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) | ||
45 | #define VER_MIN(a, b) ((a) < (b) ? (a) : (b)) | ||
46 | |||
47 | +#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) | ||
48 | extern const struct gbm_backend gbm_dri_backend; | ||
49 | +#endif | ||
50 | |||
51 | struct gbm_backend_desc { | ||
52 | const char *name; | ||
53 | @@ -51,7 +53,9 @@ struct gbm_backend_desc { | ||
54 | }; | ||
55 | |||
56 | static const struct gbm_backend_desc builtin_backends[] = { | ||
57 | +#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3) | ||
58 | { "dri", &gbm_dri_backend }, | ||
59 | +#endif | ||
60 | }; | ||
61 | |||
62 | #define BACKEND_LIB_SUFFIX "_gbm" | ||
63 | -- | ||
64 | 2.34.1 | ||
65 | |||
diff --git a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch b/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch deleted file mode 100644 index d22ff3c8a8..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From f17e836ef9b1bbc6056790596420b699e48128c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 2 Dec 2021 19:57:42 -0800 | ||
4 | Subject: [PATCH] util/format: Check for NEON before using it | ||
5 | |||
6 | This fixes build on rpi0-w and any other machine which does not have | ||
7 | neon unit and is not used as FPU unit | ||
8 | |||
9 | Fixes errors e.g. | ||
10 | |||
11 | In file included from ../mesa-21.3.0/src/util/format/u_format_unpack_neon.c:35: | ||
12 | /mnt/b/yoe/master/build/tmp/work/arm1176jzfshf-vfp-yoe-linux-gnueabi/mesa/2_21.3.0-r0/recipe-sysroot-native/usr/lib/clang/13.0.1/include/arm_neon.h:32:2: error: "NEON support not enabled" | ||
13 | |||
14 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14032] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | |||
17 | --- | ||
18 | src/util/format/u_format.c | 2 +- | ||
19 | src/util/format/u_format_unpack_neon.c | 2 +- | ||
20 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c | ||
23 | index c071250..0880984 100644 | ||
24 | --- a/src/util/format/u_format.c | ||
25 | +++ b/src/util/format/u_format.c | ||
26 | @@ -1184,7 +1184,7 @@ static void | ||
27 | util_format_unpack_table_init(void) | ||
28 | { | ||
29 | for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) { | ||
30 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
31 | +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) | ||
32 | const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format); | ||
33 | if (unpack) { | ||
34 | util_format_unpack_table[format] = unpack; | ||
35 | diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c | ||
36 | index a4a5cb1..1e4f794 100644 | ||
37 | --- a/src/util/format/u_format_unpack_neon.c | ||
38 | +++ b/src/util/format/u_format_unpack_neon.c | ||
39 | @@ -23,7 +23,7 @@ | ||
40 | |||
41 | #include <u_format.h> | ||
42 | |||
43 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
44 | +#if (defined(PIPE_ARCH_AARCH64) || (defined(__ARM_NEON) && defined(PIPE_ARCH_ARM))) && !defined(NO_FORMAT_ASM) | ||
45 | |||
46 | /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics | ||
47 | * unless you tell it "no really". | ||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb b/meta/recipes-graphics/mesa/mesa-gl_23.0.0.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_22.3.5.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_23.0.0.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index b082b49400..8f72f25c17 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -17,12 +17,9 @@ PE = "2" | |||
17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ |
18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | 18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ |
19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
20 | file://0001-util-format-Check-for-NEON-before-using-it.patch \ | ||
21 | file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ | ||
22 | file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ | ||
23 | " | 20 | " |
24 | 21 | ||
25 | SRC_URI[sha256sum] = "3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9" | 22 | SRC_URI[sha256sum] = "01f3cff3763f09e0adabcb8011e4aebc6ad48f6a4dd4bae904fe918707d253e4" |
26 | 23 | ||
27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 24 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
28 | 25 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_22.3.5.bb b/meta/recipes-graphics/mesa/mesa_23.0.0.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_22.3.5.bb +++ b/meta/recipes-graphics/mesa/mesa_23.0.0.bb | |||