diff options
Diffstat (limited to 'x11-drivers')
4 files changed, 24 insertions, 0 deletions
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-kernel-module-source-580.95.05-kernel6.18.patch b/x11-drivers/nvidia-drivers/files/nvidia-kernel-module-source-580.95.05-kernel6.18.patch new file mode 100644 index 000000000000..c0e061b6f4dc --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-kernel-module-source-580.95.05-kernel6.18.patch @@ -0,0 +1,21 @@ +get_dev_pagemap() is only used with CONFIG_ZONE_DEVICE and +USE=kernel-open, and in kernel 6.18 takes one argument in less that +NVIDIA seemingly did not need. + +This is a simplified version of 590.44.01's fix which skips the +conftest.sh changes for easier backporting (at worst the simple version +check may break if the kernel backports this to older kernels). + +[1] https://github.com/NVIDIA/open-gpu-kernel-modules/pull/951 +--- a/kernel-module-source/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c ++++ b/kernel-module-source/kernel-open/nvidia-uvm/uvm_va_range_device_p2p.c +@@ -361,5 +361,9 @@ + 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 + get_dev_pagemap(page_to_pfn(page), NULL); ++#endif + } + #else diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-580.105.08.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-580.105.08.ebuild index 76bc7af3e50d..624a5b36ea1a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-580.105.08.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-580.105.08.ebuild @@ -101,6 +101,7 @@ QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch + "${FILESDIR}"/nvidia-kernel-module-source-580.95.05-kernel6.18.patch ) pkg_setup() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild index 9f02b002dfa2..b573563dc2b6 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild @@ -101,6 +101,7 @@ QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch + "${FILESDIR}"/nvidia-kernel-module-source-580.95.05-kernel6.18.patch ) pkg_setup() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-580.95.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-580.95.05.ebuild index 9a47157f19c3..b3c27d82b45c 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-580.95.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-580.95.05.ebuild @@ -100,6 +100,7 @@ QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*" PATCHES=( "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch "${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch + "${FILESDIR}"/nvidia-kernel-module-source-580.95.05-kernel6.18.patch ) pkg_setup() { |