diff options
author | Pablo Saavedra Rodi?o <psaavedra@igalia.com> | 2021-10-18 17:28:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 17:42:26 +0100 |
commit | 6a6b4755ee5920e127034512f222d765118ebe76 (patch) | |
tree | aa08d0de3f57f48b77ac288ab31f88b79940eaa8 | |
parent | 1c1dd2097fb26219e7c4303870e182dc16a6b358 (diff) | |
download | poky-6a6b4755ee5920e127034512f222d765118ebe76.tar.gz |
mesa: upgrade 21.2.1 -> 21.2.4
Contains 'Make YUV formats we're going to emulate external-only' [1]
was applied in 21.2.4. This fixes red label issues on video for VC4,
Freedreno and others.
Deletes meta/recipes-graphics/mesa/files/without-neon.patch [2]
already in Mesa since 21.2.
Release notes:
* 21.2.2: https://docs.mesa3d.org/relnotes/21.2.2.html
* 21.2.3: https://docs.mesa3d.org/relnotes/21.2.3.html
* 21.2.4: https://docs.mesa3d.org/relnotes/21.2.4.html
[1] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13038
[2] https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569
(From OE-Core rev: 51fccaa16a3cb78ace077ba593b6cdde5e085528)
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/mesa/files/without-neon.patch | 53 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-gl_21.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/mesa/mesa_21.2.4.bb (renamed from meta/recipes-graphics/mesa/mesa_21.2.1.bb) | 0 |
4 files changed, 1 insertions, 55 deletions
diff --git a/meta/recipes-graphics/mesa/files/without-neon.patch b/meta/recipes-graphics/mesa/files/without-neon.patch deleted file mode 100644 index 56e4aa7769..0000000000 --- a/meta/recipes-graphics/mesa/files/without-neon.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | Since 80923e8d ("util/format: Add some NEON intrinsics-based u_format_unpack.") | ||
2 | upstream the build fails on Arm platforms which use the soft-float ABI, such as | ||
3 | qemuarmv5: | ||
4 | |||
5 | arm_neon.h:31:2: error: #error "NEON intrinsics not available with the | ||
6 | soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard" | ||
7 | |||
8 | Take a patch from upstream to check the ABI being used before trying to | ||
9 | use NEON instructions. | ||
10 | |||
11 | Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569] | ||
12 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
13 | |||
14 | From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001 | ||
15 | From: Adrian Bunk <bunk@debian.org> | ||
16 | Date: Thu, 26 Aug 2021 22:35:49 +0300 | ||
17 | Subject: [PATCH] util/format: NEON is not available with the soft-float ABI | ||
18 | |||
19 | Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based u_format_unpack.") | ||
20 | --- | ||
21 | src/util/format/u_format.c | 2 +- | ||
22 | src/util/format/u_format_unpack_neon.c | 2 +- | ||
23 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c | ||
26 | index c49b3788c82..31f1f240efc 100644 | ||
27 | --- a/src/util/format/u_format.c | ||
28 | +++ b/src/util/format/u_format.c | ||
29 | @@ -1138,7 +1138,7 @@ static void | ||
30 | util_format_unpack_table_init(void) | ||
31 | { | ||
32 | for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) { | ||
33 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM | ||
34 | +#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
35 | const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format); | ||
36 | if (unpack) { | ||
37 | util_format_unpack_table[format] = unpack; | ||
38 | diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c | ||
39 | index 7456d7aaa88..a4a5cb1f723 100644 | ||
40 | --- a/src/util/format/u_format_unpack_neon.c | ||
41 | +++ b/src/util/format/u_format_unpack_neon.c | ||
42 | @@ -23,7 +23,7 @@ | ||
43 | |||
44 | #include <u_format.h> | ||
45 | |||
46 | -#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM | ||
47 | +#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__) | ||
48 | |||
49 | /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics | ||
50 | * unless you tell it "no really". | ||
51 | -- | ||
52 | GitLab | ||
53 | |||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.2.4.bb index 142bb743b1..142bb743b1 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_21.2.4.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 4e95911165..f1a1e57062 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -19,10 +19,9 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | |||
19 | file://0002-meson.build-make-TLS-ELF-optional.patch \ | 19 | file://0002-meson.build-make-TLS-ELF-optional.patch \ |
20 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 20 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
21 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ | 21 | file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ |
22 | file://without-neon.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787" | 24 | SRC_URI[sha256sum] = "fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44" |
26 | 25 | ||
27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 26 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
28 | 27 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_21.2.1.bb b/meta/recipes-graphics/mesa/mesa_21.2.4.bb index 4cb7e80eb5..4cb7e80eb5 100644 --- a/meta/recipes-graphics/mesa/mesa_21.2.1.bb +++ b/meta/recipes-graphics/mesa/mesa_21.2.4.bb | |||