* [OE-core][PATCH] mesa: upgrade 21.2.1 -> 21.2.4
@ 2021-10-18 15:13 Pablo Saavedra
2021-10-18 15:15 ` Alexander Kanavin
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Saavedra @ 2021-10-18 15:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Pablo Saavedra
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
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
---
.../mesa/files/without-neon.patch | 53 -------------------
meta/recipes-graphics/mesa/mesa.inc | 3 +-
.../mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb} | 0
3 files changed, 1 insertion(+), 55 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/files/without-neon.patch
rename meta/recipes-graphics/mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb} (100%)
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 @@
-Since 80923e8d ("util/format: Add some NEON intrinsics-based u_format_unpack.")
-upstream the build fails on Arm platforms which use the soft-float ABI, such as
-qemuarmv5:
-
- arm_neon.h:31:2: error: #error "NEON intrinsics not available with the
- soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard"
-
-Take a patch from upstream to check the ABI being used before trying to
-use NEON instructions.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 26 Aug 2021 22:35:49 +0300
-Subject: [PATCH] util/format: NEON is not available with the soft-float ABI
-
-Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based u_format_unpack.")
----
- src/util/format/u_format.c | 2 +-
- src/util/format/u_format_unpack_neon.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
-index c49b3788c82..31f1f240efc 100644
---- a/src/util/format/u_format.c
-+++ b/src/util/format/u_format.c
-@@ -1138,7 +1138,7 @@ static void
- util_format_unpack_table_init(void)
- {
- for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) {
--#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
-+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
- const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format);
- if (unpack) {
- util_format_unpack_table[format] = unpack;
-diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c
-index 7456d7aaa88..a4a5cb1f723 100644
---- a/src/util/format/u_format_unpack_neon.c
-+++ b/src/util/format/u_format_unpack_neon.c
-@@ -23,7 +23,7 @@
-
- #include <u_format.h>
-
--#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
-+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
-
- /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics
- * unless you tell it "no really".
---
-GitLab
-
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 \
file://0002-meson.build-make-TLS-ELF-optional.patch \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
- file://without-neon.patch \
"
-SRC_URI[sha256sum] = "2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787"
+SRC_URI[sha256sum] = "fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/mesa/mesa_21.2.1.bb b/meta/recipes-graphics/mesa/mesa_21.2.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.2.1.bb
rename to meta/recipes-graphics/mesa/mesa_21.2.4.bb
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core][PATCH] mesa: upgrade 21.2.1 -> 21.2.4
2021-10-18 15:13 [OE-core][PATCH] mesa: upgrade 21.2.1 -> 21.2.4 Pablo Saavedra
@ 2021-10-18 15:15 ` Alexander Kanavin
2021-10-18 15:28 ` [OE-core][PATCH v2] " Pablo Saavedra
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Kanavin @ 2021-10-18 15:15 UTC (permalink / raw)
To: Pablo Saavedra Rodi?o; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 5525 bytes --]
Please also update mesa-gl recipe (a simple file rename will do).
Alex
On Mon, 18 Oct 2021 at 17:14, Pablo Saavedra Rodi?o <psaavedra@igalia.com>
wrote:
> 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
>
> Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
> ---
> .../mesa/files/without-neon.patch | 53 -------------------
> meta/recipes-graphics/mesa/mesa.inc | 3 +-
> .../mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb} | 0
> 3 files changed, 1 insertion(+), 55 deletions(-)
> delete mode 100644 meta/recipes-graphics/mesa/files/without-neon.patch
> rename meta/recipes-graphics/mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb}
> (100%)
>
> 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 @@
> -Since 80923e8d ("util/format: Add some NEON intrinsics-based
> u_format_unpack.")
> -upstream the build fails on Arm platforms which use the soft-float ABI,
> such as
> -qemuarmv5:
> -
> - arm_neon.h:31:2: error: #error "NEON intrinsics not available with the
> - soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard"
> -
> -Take a patch from upstream to check the ABI being used before trying to
> -use NEON instructions.
> -
> -Upstream-Status: Backport [
> https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569]
> -Signed-off-by: Ross Burton <ross.burton@arm.com>
> -
> -From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001
> -From: Adrian Bunk <bunk@debian.org>
> -Date: Thu, 26 Aug 2021 22:35:49 +0300
> -Subject: [PATCH] util/format: NEON is not available with the soft-float
> ABI
> -
> -Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based
> u_format_unpack.")
> ----
> - src/util/format/u_format.c | 2 +-
> - src/util/format/u_format_unpack_neon.c | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
> -index c49b3788c82..31f1f240efc 100644
> ---- a/src/util/format/u_format.c
> -+++ b/src/util/format/u_format.c
> -@@ -1138,7 +1138,7 @@ static void
> - util_format_unpack_table_init(void)
> - {
> - for (enum pipe_format format = PIPE_FORMAT_NONE; format <
> PIPE_FORMAT_COUNT; format++) {
> --#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined
> NO_FORMAT_ASM
> -+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) &&
> !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
> - const struct util_format_unpack_description *unpack =
> util_format_unpack_description_neon(format);
> - if (unpack) {
> - util_format_unpack_table[format] = unpack;
> -diff --git a/src/util/format/u_format_unpack_neon.c
> b/src/util/format/u_format_unpack_neon.c
> -index 7456d7aaa88..a4a5cb1f723 100644
> ---- a/src/util/format/u_format_unpack_neon.c
> -+++ b/src/util/format/u_format_unpack_neon.c
> -@@ -23,7 +23,7 @@
> -
> - #include <u_format.h>
> -
> --#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined
> NO_FORMAT_ASM
> -+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) &&
> !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
> -
> - /* armhf builds default to vfp, not neon, and refuses to compile neon
> intrinsics
> - * unless you tell it "no really".
> ---
> -GitLab
> -
> 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 \
> file://0002-meson.build-make-TLS-ELF-optional.patch \
> file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
> \
>
> file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
> - file://without-neon.patch \
> "
>
> -SRC_URI[sha256sum] =
> "2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787"
> +SRC_URI[sha256sum] =
> "fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44"
>
> UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
>
> diff --git a/meta/recipes-graphics/mesa/mesa_21.2.1.bb
> b/meta/recipes-graphics/mesa/mesa_21.2.4.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa_21.2.1.bb
> rename to meta/recipes-graphics/mesa/mesa_21.2.4.bb
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157080):
> https://lists.openembedded.org/g/openembedded-core/message/157080
> Mute This Topic: https://lists.openembedded.org/mt/86416379/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 8321 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [OE-core][PATCH v2] mesa: upgrade 21.2.1 -> 21.2.4
2021-10-18 15:15 ` Alexander Kanavin
@ 2021-10-18 15:28 ` Pablo Saavedra
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Saavedra @ 2021-10-18 15:28 UTC (permalink / raw)
To: openembedded-core; +Cc: Pablo Saavedra
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
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
---
.../mesa/files/without-neon.patch | 53 -------------------
.../{mesa-gl_21.2.1.bb => mesa-gl_21.2.4.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 3 +-
.../mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb} | 0
4 files changed, 1 insertion(+), 55 deletions(-)
delete mode 100644 meta/recipes-graphics/mesa/files/without-neon.patch
rename meta/recipes-graphics/mesa/{mesa-gl_21.2.1.bb => mesa-gl_21.2.4.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_21.2.1.bb => mesa_21.2.4.bb} (100%)
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 @@
-Since 80923e8d ("util/format: Add some NEON intrinsics-based u_format_unpack.")
-upstream the build fails on Arm platforms which use the soft-float ABI, such as
-qemuarmv5:
-
- arm_neon.h:31:2: error: #error "NEON intrinsics not available with the
- soft-float ABI. Please use -mfloat-abi=softfp or -mfloat-abi=hard"
-
-Take a patch from upstream to check the ABI being used before trying to
-use NEON instructions.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12569]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 5dcce985a6dd3b7856d65e21db753e2c7a0f5dd5 Mon Sep 17 00:00:00 2001
-From: Adrian Bunk <bunk@debian.org>
-Date: Thu, 26 Aug 2021 22:35:49 +0300
-Subject: [PATCH] util/format: NEON is not available with the soft-float ABI
-
-Fixes: 80923e8d58cc ("util/format: Add some NEON intrinsics-based u_format_unpack.")
----
- src/util/format/u_format.c | 2 +-
- src/util/format/u_format_unpack_neon.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/format/u_format.c b/src/util/format/u_format.c
-index c49b3788c82..31f1f240efc 100644
---- a/src/util/format/u_format.c
-+++ b/src/util/format/u_format.c
-@@ -1138,7 +1138,7 @@ static void
- util_format_unpack_table_init(void)
- {
- for (enum pipe_format format = PIPE_FORMAT_NONE; format < PIPE_FORMAT_COUNT; format++) {
--#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
-+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
- const struct util_format_unpack_description *unpack = util_format_unpack_description_neon(format);
- if (unpack) {
- util_format_unpack_table[format] = unpack;
-diff --git a/src/util/format/u_format_unpack_neon.c b/src/util/format/u_format_unpack_neon.c
-index 7456d7aaa88..a4a5cb1f723 100644
---- a/src/util/format/u_format_unpack_neon.c
-+++ b/src/util/format/u_format_unpack_neon.c
-@@ -23,7 +23,7 @@
-
- #include <u_format.h>
-
--#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined NO_FORMAT_ASM
-+#if (defined(PIPE_ARCH_AARCH64) || defined(PIPE_ARCH_ARM)) && !defined(NO_FORMAT_ASM) && !defined(__SOFTFP__)
-
- /* armhf builds default to vfp, not neon, and refuses to compile neon intrinsics
- * unless you tell it "no really".
---
-GitLab
-
diff --git a/meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb b/meta/recipes-graphics/mesa/mesa-gl_21.2.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_21.2.1.bb
rename to 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 \
file://0002-meson.build-make-TLS-ELF-optional.patch \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
- file://without-neon.patch \
"
-SRC_URI[sha256sum] = "2c65e6710b419b67456a48beefd0be827b32db416772e0e363d5f7d54dc01787"
+SRC_URI[sha256sum] = "fe6ede82d1ac02339da3c2ec1820a379641902fd351a52cc01153f76eff85b44"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/mesa/mesa_21.2.1.bb b/meta/recipes-graphics/mesa/mesa_21.2.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.2.1.bb
rename to meta/recipes-graphics/mesa/mesa_21.2.4.bb
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-18 15:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 15:13 [OE-core][PATCH] mesa: upgrade 21.2.1 -> 21.2.4 Pablo Saavedra
2021-10-18 15:15 ` Alexander Kanavin
2021-10-18 15:28 ` [OE-core][PATCH v2] " Pablo Saavedra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).