diff --git a/kernel-6.10.patch b/kernel-6.10.patch new file mode 100644 index 0000000..6254163 --- /dev/null +++ b/kernel-6.10.patch @@ -0,0 +1,64 @@ +--- open-gpu-kernel-modules-555.42.06/kernel-open/conftest.sh 2024-07-10 18:51:10.000000000 +0200 ++++ open-gpu-kernel-modules-560.35.03/kernel-open/conftest.sh 2024-08-19 19:46:21.000000000 +0200 +@@ -5252,25 +5252,23 @@ + compile_check_conftest "$CODE" "NV_PCI_CLASS_MULTIMEDIA_HD_AUDIO_PRESENT" "" "generic" + ;; + +- unsafe_follow_pfn) ++ follow_pfn) + # +- # Determine if unsafe_follow_pfn() is present. ++ # Determine if follow_pfn() is present. + # +- # unsafe_follow_pfn() was added by commit 69bacee7f9ad +- # ("mm: Add unsafe_follow_pfn") in v5.13-rc1. +- # +- # Note: this commit never made it to the linux kernel, so +- # unsafe_follow_pfn() never existed. ++ # follow_pfn() was added by commit 3b6748e2dd69 ++ # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed ++ # by commit 233eb0bf3b94 ("mm: remove follow_pfn") ++ # from linux-next 233eb0bf3b94. + # + CODE=" + #include +- void conftest_unsafe_follow_pfn(void) { +- unsafe_follow_pfn(); ++ void conftest_follow_pfn(void) { ++ follow_pfn(); + }" + +- compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions" ++ compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions" + ;; +- + drm_plane_atomic_check_has_atomic_state_arg) + # + # Determine if drm_plane_helper_funcs::atomic_check takes 'state' +--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/nvidia.Kbuild 2024-07-10 18:51:10.000000000 +0200 ++++ open-gpu-kernel-modules-560.35.03/kernel-open/nvidia/nvidia.Kbuild 2024-08-19 19:46:21.000000000 +0200 +@@ -161,7 +161,7 @@ + NV_CONFTEST_FUNCTION_COMPILE_TESTS += vga_tryget + NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc_platform_has + NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter +-NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn ++NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked + NV_CONFTEST_FUNCTION_COMPILE_TESTS += add_memory_driver_managed +--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c.orig 2024-08-28 13:52:38.761337000 +0200 ++++ open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c 2024-08-28 13:53:44.976357000 +0200 +@@ -36,10 +36,10 @@ static inline int nv_follow_pfn(struct v + unsigned long address, + unsigned long *pfn) + { +-#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT) +- return unsafe_follow_pfn(vma, address, pfn); +-#else ++#if defined(NV_FOLLOW_PFN_PRESENT) + return follow_pfn(vma, address, pfn); ++#else ++ return -1; + #endif + } + diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index f7ed255..5f3e9d3 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,7 +1,20 @@ +------------------------------------------------------------------- +Wed Aug 28 11:02:09 UTC 2024 - Stefan Dirsch + +- reverted CUDA update version to 560.x.y due to changes in CUDA + repository with CUDA 12.6/560.x.y drivers +- kernel-6.10.patch: + * fixes build of 555.42.06 against Kernel 6.10 + +------------------------------------------------------------------- +Sun Aug 25 10:43:01 UTC 2024 - Stefan Dirsch + +- For CUDA update version to 560.35.03 + ------------------------------------------------------------------- Mon Aug 12 10:53:10 UTC 2024 - Stefan Dirsch -- Update to 550.107.02 +- Update to 550.107.02 (boo#1229716) ------------------------------------------------------------------- Sat Aug 10 12:16:49 UTC 2024 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index a40997a..7296407 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -17,7 +17,7 @@ %define gfx_version 550.107.02 -%define cuda_version 560.28.03 +%define cuda_version 555.42.06 %global flavor @BUILD_FLAVOR@%{?nil} %if "%{flavor}" == "cuda" @@ -81,6 +81,9 @@ Source11: pesign-copy-sources Source12: pesign-spec-macros Source14: group-source-files.pl Patch0: persistent-nvidia-id-string.patch +%if "%{flavor}" == "cuda" +Patch1: kernel-6.10.patch +%endif BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: fdupes BuildRequires: gcc-c++ diff --git a/open-gpu-kernel-modules-555.42.06.tar.gz b/open-gpu-kernel-modules-555.42.06.tar.gz new file mode 100644 index 0000000..9528679 --- /dev/null +++ b/open-gpu-kernel-modules-555.42.06.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14a336e1061adf18fea69a2c7e875fe3570315d5efbedb196840c56d6b9c67b8 +size 14032626 diff --git a/open-gpu-kernel-modules-560.28.03.tar.gz b/open-gpu-kernel-modules-560.28.03.tar.gz deleted file mode 100644 index 1062e43..0000000 --- a/open-gpu-kernel-modules-560.28.03.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ba2b9d2dfe72ca3c9b21bbded0a4072a6e962f74b0576fa85480a1ffee416d2 -size 15532764 diff --git a/pci_ids-560.28.03 b/pci_ids-555.42.06 similarity index 100% rename from pci_ids-560.28.03 rename to pci_ids-555.42.06 diff --git a/pci_ids-supported-560.28.03 b/pci_ids-supported-555.42.06 similarity index 99% rename from pci_ids-supported-560.28.03 rename to pci_ids-supported-555.42.06 index 3c4c82a..350189c 100644 --- a/pci_ids-supported-560.28.03 +++ b/pci_ids-supported-555.42.06 @@ -217,7 +217,6 @@ 0x2805 NVIDIA GeForce RTX 4060 Ti 0x2808 NVIDIA GeForce RTX 4060 0x2820 NVIDIA GeForce RTX 4070 Laptop GPU -0x2822 NVIDIA GeForce RTX 3050 A Laptop GPU 0x2838 NVIDIA RTX 3000 Ada Generation Laptop GPU 0x2860 NVIDIA GeForce RTX 4070 Laptop GPU 0x2882 NVIDIA GeForce RTX 4060