PR#35: Update to 24.0.0-rc1 - rpms/mesa

rpms / mesa

#35 Update to 24.0.0-rc1

Merged 3 months ago by airlied. Opened 3 months ago by javierm.

rpms/ javierm/mesa main into main

Update to 24.0.0-rc1

Javier Martinez Canillas • 3 months ago

7f3a9f9

mesa-meson-c99.patch

file removed

-42

		`@@ -1,42 +0,0 @@`
		`- meson: C type error in strtod_l/strtof_l probe`
		`-`
		`- Future compilers will fail compilation due to the C type error:`
		`-`
		`- …/testfile.c: In function 'main':`
		`- …/testfile.c:12:30: error: passing argument 2 of 'strtod_l' from incompatible pointer type`
		`- 12 \| double d = strtod_l(s, end, loc);`
		`- \| ^~~`
		`- \| \|`
		`- \| char *`
		`- /usr/include/stdlib.h:416:43: note: expected 'char ** restrict' but argument is of type 'char *'`
		`- 416 \| char **__restrict __endptr, locale_t __loc)`
		`- \| ~~~~~~~~~~~~~~~~~~^~~~~~~~`
		`- …/testfile.c:13:29: error: passing argument 2 of 'strtof_l' from incompatible pointer type`
		`- 13 \| float f = strtof_l(s, end, loc);`
		`- \| ^~~`
		`- \| \|`
		`- \| char *`
		`- /usr/include/stdlib.h:420:42: note: expected 'char ** restrict' but argument is of type 'char *'`
		`- 420 \| char **__restrict __endptr, locale_t __loc)`
		`- \| ~~~~~~~~~~~~~~~~~~^~~~~~~~`
		`-`
		`- This means that the probe no longer tests is objective and always`
		`- fails.`
		`-`
		`- Submitted upstream: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26927>`
		`-`
		`- diff --git a/meson.build b/meson.build`
		`- index 35cc5f1cd5fd9079..1a5d2ba492be0b31 100644`
		`- --- a/meson.build`
		`- +++ b/meson.build`
		`- @@ -1425,8 +1425,8 @@ if cc.links('''`
		`- locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL);`
		`- const char *s = "1.0";`
		`- char *end;`
		`- - double d = strtod_l(s, end, loc);`
		`- - float f = strtof_l(s, end, loc);`
		`- + double d = strtod_l(s, &end, loc);`
		`- + float f = strtof_l(s, &end, loc);`
		`- freelocale(loc);`
		`- return 0;`
		`- }''',`

mesa.spec

file modified

+11 -4

		`@@ -34,7 +34,7 @@`
		`%global with_tegra 1`
		`%global with_v3d 1`
		`%global with_xa 1`
		`- %global extra_platform_vulkan ,broadcom,freedreno,panfrost`
		`+ %global extra_platform_vulkan ,broadcom,freedreno,panfrost,imagination-experimental`
		`%endif`

		`%ifnarch s390x`
		`@@ -61,7 +61,7 @@`

		`Name: mesa`
		`Summary: Mesa graphics libraries`
		`- %global ver 23.3.3`
		`+ %global ver 24.0.0-rc1`
		`Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}`
		`Release: %autorelease`
		`License: MIT AND BSD-3-Clause AND SGI-B-2.0`
		`@@ -74,8 +74,6 @@`
		`Source1: Mesa-MLAA-License-Clarification-Email.txt`

		`Patch10: gnome-shell-glthread-disable.patch`
		`- Patch11: zink-fix-resizable-bar-detection-logic.patch`
		`- Patch12: mesa-meson-c99.patch`

		`BuildRequires: meson >= 1.2.0`
		`BuildRequires: gcc`
		`@@ -596,20 +594,26 @@`
		`%if 0%{?with_kmsro}`
		`%{_libdir}/dri/armada-drm_dri.so`
		`%{_libdir}/dri/exynos_dri.so`
		`+ %{_libdir}/dri/gm12u320_dri.so`
		`%{_libdir}/dri/hdlcd_dri.so`
		`%{_libdir}/dri/hx8357d_dri.so`
		`+ %{_libdir}/dri/ili9163_dri.so`
		`%{_libdir}/dri/ili9225_dri.so`
		`%{_libdir}/dri/ili9341_dri.so`
		`+ %{_libdir}/dri/ili9486_dri.so`
		`%{_libdir}/dri/imx-dcss_dri.so`
		`%{_libdir}/dri/mediatek_dri.so`
		`%{_libdir}/dri/meson_dri.so`
		`%{_libdir}/dri/mi0283qt_dri.so`
		`+ %{_libdir}/dri/panel-mipi-dbi_dri.so`
		`%{_libdir}/dri/pl111_dri.so`
		`%{_libdir}/dri/repaper_dri.so`
		`%{_libdir}/dri/rockchip_dri.so`
		`%{_libdir}/dri/st7586_dri.so`
		`%{_libdir}/dri/st7735r_dri.so`
		`+ %{_libdir}/dri/sti_dri.so`
		`%{_libdir}/dri/sun4i-drm_dri.so`
		`+ %{_libdir}/dri/udl_dri.so`
		`%endif`
		`%if 0%{?with_vulkan_hw}`
		`%{_libdir}/dri/zink_dri.so`
		`@@ -646,7 +650,10 @@`

		`%files vulkan-drivers`
		`%{_libdir}/libvulkan_lvp.so`
		`+ %{_libdir}/libpowervr_rogue.so`
		`+ %{_libdir}/libvulkan_powervr_mesa.so`
		`%{_datadir}/vulkan/icd.d/lvp_icd.*.json`
		`+ %{_datadir}/vulkan/icd.d/powervr_mesa_icd.*.json`
		`%{_libdir}/libVkLayer_MESA_device_select.so`
		`%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json`
		`%if 0%{?with_vulkan_hw}`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (mesa-23.3.3.tar.xz) = bed23e8324b026edd5d2b16a381ec563cf2fa9be9c8fbe8d9fb907cab9d87eef91f493fb9d4e3973d4b679e271d2a85ce48af491585638ab97f087532fc63c30`
		`+ SHA512 (mesa-24.0.0-rc1.tar.xz) = e57b6b63baab77d17c7ba149bd5856fa64e6852ab2b134df8d3bb20b5aedd2b7223f500b6f6fed4095a3b52217eec17ce4e688c47a90220645416c54ce0e9e46`

zink-fix-resizable-bar-detection-logic.patch

file removed

-39

		`@@ -1,39 +0,0 @@`
		`- From a077c14f150f1c4f670dce381ac2eb548f1a4ac2 Mon Sep 17 00:00:00 2001`
		`- From: Alessandro Astone <ales.astone@gmail.com>`
		`- Date: Wed, 10 Jan 2024 17:24:30 +0100`
		`- Subject: [PATCH] zink: Fix resizable BAR detection logic`
		`-`
		`- This was broken in two ways:`
		`- * When looking for the MAX biggest_ram it was actually comparing`
		`- a candidate against biggest_vis_ram`
		`-`
		`- * mem_props.memoryTypes[] should be accessed with the memory type`
		`- index as found in heap_map`
		`-`
		`- Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10341`
		`- Cc: 23.3 <mesa-stable>`
		`- Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26979>`
		`- ---`
		`- src/gallium/drivers/zink/zink_screen.c \| 4 ++--`
		`- 1 file changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c`
		`- index 5a6d17cb4fa3..6697d7ab938c 100644`
		`- --- a/src/gallium/drivers/zink/zink_screen.c`
		`- +++ b/src/gallium/drivers/zink/zink_screen.c`
		`- @@ -3258,10 +3258,10 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev`
		`- {`
		`- uint64_t biggest_vis_vram = 0;`
		`- for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL_VISIBLE]; i++)`
		`- - biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);`
		`- + biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL_VISIBLE][i]].heapIndex].size);`
		`- uint64_t biggest_vram = 0;`
		`- for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL]; i++)`
		`- - biggest_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);`
		`- + biggest_vram = MAX2(biggest_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL][i]].heapIndex].size);`
		`- /* determine if vis vram is roughly equal to total vram */`
		`- if (biggest_vis_vram > biggest_vram * 0.9)`
		`- screen->resizable_bar = true;`
		`- --`
		`- GitLab`
		`-`

javierm commented 3 months ago

The new Imagination DRM driver is being enabled for kernel-ark in the following MR:

https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2878

Initial mesa support for this driver landed in 24.0.0-rc1, update the mesa package to start getting support for boards using the Imagination GPUs, such as the AM625 BeaglePlay.

zuul commented 3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/6e71411f6e144bb2b073a00cc7e6599b

check-for-arches : SUCCESS in 2m 25s
rpm-scratch-build : SUCCESS in 30m 04s
rpm-scratch-build-s390x : SUCCESS in 17m 14s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 27m 15s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 21m 34s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 22m 04s (non-voting)
rpm-linter : FAILURE in 19m 28s (non-voting)
rpm-rpminspect : TIMED_OUT in 30m 47s (non-voting)
check-for-sti-tests : SUCCESS in 15s
check-for-fmf-tests : SUCCESS in 15s
rpm-install-test : SUCCESS in 2m 59s
Skipped 2 jobs

zuul commented 3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/7a524e97a96a41ddbe239fb23c2b70d2

check-for-arches : SUCCESS in 1m 41s
rpm-scratch-build : SUCCESS in 31m 02s
rpm-scratch-build-s390x : SUCCESS in 12m 55s (non-voting)
rpm-scratch-build-ppc64le : FAILURE in 5m 47s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 32m 04s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 19m 09s (non-voting)
rpm-linter : FAILURE in 17m 44s (non-voting)
rpm-rpminspect : TIMED_OUT in 31m 01s (non-voting)
check-for-sti-tests : SUCCESS in 15s
check-for-fmf-tests : SUCCESS in 16s
rpm-install-test : SUCCESS in 2m 52s
Skipped 2 jobs

jexposit commented 3 months ago

Given that Fedora 40 will be released in April and mesa 24 should be stabled by the end of this month (https://docs.mesa3d.org/release-calendar.html). I think it'd be a good idea to merge this. @airlied do you agree?

@javierm would you need a newer version of libdrm as well? We could rebase it on Rawhide as well.

javierm commented 3 months ago

Given that Fedora 40 will be released in April and mesa 24 should be stabled by the end of this month (https://docs.mesa3d.org/release-calendar.html). I think it'd be a good idea to merge this. @airlied do you agree?

@javierm would you need a newer version of libdrm as well? We could rebase it on Rawhide as well.

I don't think is needed but would be good to rebase anyways IMO.

rebased onto f2ba3e0

3 months ago

rebased onto b19cdfb

3 months ago

rebased onto 7f3a9f9

3 months ago

zuul commented 3 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/c0c53b17b2f2496b9c68be339a6b19e7