Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / nvidia-utils
Commits: aeb9ff98 by Jan Alexander Steffens (heftig) at 2025-12-03T08:40:33+01:00 Replace with earlier patch from CachyOS - - - - - 2 changed files: - 0004-Fix-build-with-kernel-6.18.patch → 0004-nvidia-uvm-Remove-unused-get_devmap_page-parameter.patch - PKGBUILD Changes: ===================================== 0004-Fix-build-with-kernel-6.18.patch → 0004-nvidia-uvm-Remove-unused-get_devmap_page-parameter.patch ===================================== @@ -1,25 +1,35 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Tue, 2 Dec 2025 01:05:08 +0100 -Subject: [PATCH] Fix build with kernel 6.18 +From: Eric Naim <[email protected]> +Date: Mon, 13 Oct 2025 15:54:41 +0800 +Subject: [PATCH] nvidia-uvm: Remove unused get_devmap_page() parameter +Signed-off-by: Eric Naim <[email protected]> --- - kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c | 4 ++++ - 1 file changed, 4 insertions(+) + kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c b/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c -index 8a5c87bd3c3a..2f47def3a09f 100644 +index 8a5c87bd3c3a..767531bd2b3a 100644 --- a/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c +++ b/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c -@@ -360,7 +360,11 @@ static NV_STATUS alloc_device_p2p_mem(uvm_gpu_t *gpu, +@@ -21,6 +21,8 @@ + + *******************************************************************************/ + ++#include <linux/version.h> ++ + #include "uvm_common.h" + #include "uvm_linux.h" + #include "uvm_types.h" +@@ -360,7 +362,11 @@ static NV_STATUS alloc_device_p2p_mem(uvm_gpu_t *gpu, // a reference to them, so take one now if using DEVICE_COHERENT pages. if (gpu->parent->cdmm_enabled) { get_page(page); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 0) -+ get_dev_pagemap(page_to_pfn(page)); -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 18, 0) get_dev_pagemap(page_to_pfn(page), NULL); -+#endif ++#else ++ get_dev_pagemap(page_to_pfn(page)); ++#endif /* < 6.18 */ } #else // CDMM P2PDMA will never be enabled for this case ===================================== PKGBUILD ===================================== @@ -26,7 +26,7 @@ source=('nvidia-drm-outputclass.conf' 0001-Enable-atomic-kernel-modesetting-by-default.patch 0002-Add-IBT-support.patch 0003-Revert-a-change-related-to-the-display-stack-in-580..patch - 0004-Fix-build-with-kernel-6.18.patch) + 0004-nvidia-uvm-Remove-unused-get_devmap_page-parameter.patch) sha512sums=('de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770' '1bcf2c6ee71686c0d32625e746ec8c0f7cf42fc63c76c3076ff2526b2661e8b9e9f76eaa2c4b213c7cc437a6f06006cc07672c4974d7f4515b2de2fd7c47a891' 'f8f071f5a46c1a5ce5188e104b017808d752e61c0c20de1466feb5d693c0b55a5586314411e78cc2ab9c0e16e2c67afdd358da94c0c75df1f8233f54c280762c' @@ -38,7 +38,7 @@ sha512sums=('de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc50677 '98ff06b32bac4297b4ca68e069750114ab5caf41d2a58f945488b52acf97c34dd3b64a6af609f8972e688bd646fe3ee598e699534001230d6f0154cebe6ff5d1' '3c4d87686cc79f09feca29df1a8c1973412b48077870b0d3424d575500234e9522b93df53bb6ecd72afd8dc69ecb4a8e7bd3e206080348d30a48c00e62f42943' '55b9e5073ebf04fb050ca73b22c86d343f8b3a95e938e89c8f2efd65f40d75438a7c8f448860941e3d790b8a299383b1f55880bb9a51041124064dc1a1570e71' - '16fdddf08dd6023375d23d10d029a996deced33513e519638d3bc1337192ed2d09dd016aa3961ca62d7349495875acd4e63c03234bbaf18939732c97b16d0ab5') + 'b38297a6fc1eb7200802a8c3b1000139aa5519fd3eca50ee8de1bc2e17ada077f68a54b7432c093ed1c86604a47c60d12729c0001eb485f28a01ece1f03ccfac') create_links() { @@ -66,7 +66,7 @@ prepare() { patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_pkg_open}" patch -Np1 -i "${srcdir}/0002-Add-IBT-support.patch" -d "${srcdir}/${_pkg_open}" patch -Np1 -i "${srcdir}/0003-Revert-a-change-related-to-the-display-stack-in-580..patch" -d "${srcdir}/${_pkg_open}" - patch -Np1 -i "${srcdir}/0004-Fix-build-with-kernel-6.18.patch" -d "${srcdir}/${_pkg_open}" + patch -Np1 -i "${srcdir}/0004-nvidia-uvm-Remove-unused-get_devmap_page-parameter.patch" -d "${srcdir}/${_pkg_open}" # Attempt to make builds reproducible sed -i "s/^ HOSTNAME.*/ HOSTNAME = echo archlinux/" "${srcdir}/${_pkg_open}/utils.mk" View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/commit/aeb9ff9898e17aedb26e794ec1cda4abd6428ad7 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/nvidia-utils/-/commit/aeb9ff9898e17aedb26e794ec1cda4abd6428ad7 You're receiving this email because of your account on gitlab.archlinux.org.
