git: 3ac25a867c05 - main - graphics/mesa-devel: unbreak on 64-bit archs after b95e493d187f
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 Jan 2026 23:49:53 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3ac25a867c054eb5c06dd9a36387c7cc6f77f682
commit 3ac25a867c054eb5c06dd9a36387c7cc6f77f682
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2026-01-23 22:31:37 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2026-01-23 23:49:34 +0000
graphics/mesa-devel: unbreak on 64-bit archs after b95e493d187f
../src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp:1653:84: error: format specifies type 'unsigned long long' but the argument has type '__u64' (aka 'unsigned long') [-Werror,-Wformat]
1652 | mesa_logi("amdgpu: uq_log: %s: num_wait_fences=%d uq_va=%llx job=%llx\n",
| ~~~~
| %lx
1653 | amdgpu_userq_str[acs->queue_index], userq_wait_data.num_fences, fence_info[i].va,
| ^~~~~~~~~~~~~~~~
../src/util/log.h:78:78: note: expanded from macro 'mesa_logi'
78 | #define mesa_logi(fmt, ...) mesa_log(MESA_LOG_INFO, (MESA_LOG_TAG), (fmt), ##__VA_ARGS__)
| ~~~ ^~~~~~~~~~~
../src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp:1654:20: error: format specifies type 'unsigned long long' but the argument has type '__u64' (aka 'unsigned long') [-Werror,-Wformat]
1652 | mesa_logi("amdgpu: uq_log: %s: num_wait_fences=%d uq_va=%llx job=%llx\n",
| ~~~~
| %lx
1653 | amdgpu_userq_str[acs->queue_index], userq_wait_data.num_fences, fence_info[i].va,
1654 | fence_info[i].value);
| ^~~~~~~~~~~~~~~~~~~
../src/util/log.h:78:78: note: expanded from macro 'mesa_logi'
78 | #define mesa_logi(fmt, ...) mesa_log(MESA_LOG_INFO, (MESA_LOG_TAG), (fmt), ##__VA_ARGS__)
| ~~~ ^~~~~~~~~~~
Reported by: pkg-fallout
---
graphics/mesa-devel/files/patch-amdgpu_log | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/graphics/mesa-devel/files/patch-amdgpu_log b/graphics/mesa-devel/files/patch-amdgpu_log
new file mode 100644
index 000000000000..9fb7a4220afe
--- /dev/null
+++ b/graphics/mesa-devel/files/patch-amdgpu_log
@@ -0,0 +1,13 @@
+https://gitlab.freedesktop.org/mesa/mesa/-/issues/14716
+
+--- src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp.orig 2026-01-21 23:15:42 UTC
++++ src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp
+@@ -1649,7 +1649,7 @@ static int amdgpu_cs_submit_ib_userq(struct amdgpu_use
+ * mapped to same address for all process/apps. Once uq_va is guess mapped to a
+ * given queue, cross process/queue fence dependency can be analyzed.
+ */
+- mesa_logi("amdgpu: uq_log: %s: num_wait_fences=%d uq_va=%llx job=%llx\n",
++ mesa_logi("amdgpu: uq_log: %s: num_wait_fences=%d uq_va=%" PRIx64 " job=%" PRIx64 "\n",
+ amdgpu_userq_str[acs->queue_index], userq_wait_data.num_fences, fence_info[i].va,
+ fence_info[i].value);
+ }