diff --git a/kernel-6.10.patch b/kernel-6.10.patch deleted file mode 100644 index 6254163..0000000 --- a/kernel-6.10.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 3793440..274bfca 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Oct 23 02:50:30 UTC 2024 - Stefan Dirsch + +- Update to 550.127.05 (boo#1232057) + * Fixed a bug which could cause applications using GBM to crash + when running with nvidia-drm.modeset=0. + +------------------------------------------------------------------- +Mon Oct 21 11:32:45 UTC 2024 - Stefan Dirsch + +- cuda-flavor + provide also nvidia-open-driver-G06-kmp-$flavor = %version to + workaround broken cuda-drivers + +------------------------------------------------------------------- +Fri Oct 18 19:35:16 UTC 2024 - Stefan Dirsch + +- For CUDA update version to 560.35.03 +- supersedes kernel-6.10.patch + ------------------------------------------------------------------- Fri Oct 18 13:31:46 UTC 2024 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 24c1aa6..7866f4d 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -16,8 +16,8 @@ # -%define gfx_version 550.120 -%define cuda_version 555.42.06 +%define gfx_version 550.127.05 +%define cuda_version 560.35.03 %global flavor @BUILD_FLAVOR@%{?nil} %if "%{flavor}" == "cuda" @@ -82,9 +82,6 @@ Source12: pesign-spec-macros Source14: group-source-files.pl Source15: kmp-trigger.sh Patch0: persistent-nvidia-id-string.patch -%if "%{flavor}" == "cuda" -Patch1: kernel-6.10.patch -%endif %if "%{flavor}" != "cuda" %ifarch aarch64 %if 0%{?suse_version} >= 1600 diff --git a/open-gpu-kernel-modules-550.120.tar.gz b/open-gpu-kernel-modules-550.120.tar.gz deleted file mode 100644 index b887b8f..0000000 --- a/open-gpu-kernel-modules-550.120.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:029a8ecae291c7d79d84b8946c2abc0e444186b79c778634ec9c663bcb2c89e4 -size 13817806 diff --git a/open-gpu-kernel-modules-550.127.05.tar.gz b/open-gpu-kernel-modules-550.127.05.tar.gz new file mode 100644 index 0000000..da5d1e5 --- /dev/null +++ b/open-gpu-kernel-modules-550.127.05.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fcbb2c68d3f9150b931f81f096a5cb41fdfdeed787d6df05249ff636d5981dd +size 13835212 diff --git a/open-gpu-kernel-modules-555.42.06.tar.gz b/open-gpu-kernel-modules-555.42.06.tar.gz deleted file mode 100644 index 9528679..0000000 --- a/open-gpu-kernel-modules-555.42.06.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14a336e1061adf18fea69a2c7e875fe3570315d5efbedb196840c56d6b9c67b8 -size 14032626 diff --git a/open-gpu-kernel-modules-560.35.03.tar.gz b/open-gpu-kernel-modules-560.35.03.tar.gz new file mode 100644 index 0000000..850a78a --- /dev/null +++ b/open-gpu-kernel-modules-560.35.03.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5dfb5e9b051510cfa987a25a2afe58f8746582128a0e79cc2839b2ed2c7bc58 +size 15534656 diff --git a/pci_ids-550.120 b/pci_ids-550.127.05 similarity index 100% rename from pci_ids-550.120 rename to pci_ids-550.127.05 diff --git a/pci_ids-555.42.06 b/pci_ids-560.35.03 similarity index 100% rename from pci_ids-555.42.06 rename to pci_ids-560.35.03 diff --git a/pci_ids-supported-550.120 b/pci_ids-supported-550.127.05 similarity index 100% rename from pci_ids-supported-550.120 rename to pci_ids-supported-550.127.05 diff --git a/pci_ids-supported-555.42.06 b/pci_ids-supported-560.35.03 similarity index 100% rename from pci_ids-supported-555.42.06 rename to pci_ids-supported-560.35.03 diff --git a/preamble b/preamble index 2ac7552..1213ef7 100644 --- a/preamble +++ b/preamble @@ -10,6 +10,7 @@ Conflicts: nvidia-open-driver-G06-signed-kmp Conflicts: nvidia-open-driver-G06-signed-kmp-%1 # workaround for broken cuda-drivers Provides: nvidia-open-driver-G06-kmp = %{-v*} +Provides: nvidia-open-driver-G06-kmp-%1 = %{-v*} Requires: (kernel-firmware-nvidia-gspx-G06 = %{-v*} if (nvidia-compute-utils-G06 = %{-v*} or nvidia-compute-G06 = %{-v*} or sle-module-NVIDIA-compute-release)) %else Requires: (kernel-firmware-nvidia-gspx-G06 = %{-v*} if nvidia-compute-utils-G06 = %{-v*})