diff --git a/0001-Don-t-override-INSTALL_MOD_DIR.patch b/0001-Don-t-override-INSTALL_MOD_DIR.patch deleted file mode 100644 index 6015231..0000000 --- a/0001-Don-t-override-INSTALL_MOD_DIR.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2382801d11b73d8107c7f13747ebc76921f8d8ea Mon Sep 17 00:00:00 2001 -From: Patrik Jakobsson -Date: Fri, 13 May 2022 11:10:34 +0200 -Subject: [PATCH] Don't override INSTALL_MOD_DIR - -Signed-off-by: Patrik Jakobsson ---- - kernel-open/Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/kernel-open/Makefile b/kernel-open/Makefile -index e0ed5e9..9f54630 100644 ---- a/kernel-open/Makefile -+++ b/kernel-open/Makefile -@@ -74,7 +74,6 @@ else - KBUILD_PARAMS += NV_KERNEL_SOURCES=$(KERNEL_SOURCES) - KBUILD_PARAMS += NV_KERNEL_OUTPUT=$(KERNEL_OUTPUT) - KBUILD_PARAMS += NV_KERNEL_MODULES="$(NV_KERNEL_MODULES)" -- KBUILD_PARAMS += INSTALL_MOD_DIR=kernel/drivers/video - KBUILD_PARAMS += NV_SPECTRE_V2=$(SPECTRE_V2_RETPOLINE) - - .PHONY: modules module clean clean_conftest modules_install --- -2.36.1 - diff --git a/kernel-6.7.patch b/kernel-6.7.patch deleted file mode 100644 index 82cca28..0000000 --- a/kernel-6.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u -r open-gpu-kernel-modules-545.29.06.orig/kernel-open/nvidia/libspdm_shash.c open-gpu-kernel-modules-545.29.06/kernel-open/nvidia/libspdm_shash.c ---- open-gpu-kernel-modules-545.29.06.orig/kernel-open/nvidia/libspdm_shash.c 2024-01-24 14:32:54.546727576 +0100 -+++ open-gpu-kernel-modules-545.29.06/kernel-open/nvidia/libspdm_shash.c 2024-01-24 14:47:06.663986342 +0100 -@@ -20,6 +20,7 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+#include - - #include "internal_crypt_lib.h" - -@@ -87,8 +88,13 @@ - - struct crypto_shash *src_tfm = src->tfm; - struct crypto_shash *dst_tfm = dst->tfm; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0) -+ char *src_ipad = crypto_tfm_ctx_align(&src_tfm->base, crypto_tfm_alg_alignmask(&src_tfm->base) + 1); -+ char *dst_ipad = crypto_tfm_ctx_align(&dst_tfm->base, crypto_tfm_alg_alignmask(&dst_tfm->base) + 1); -+#else - char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base); - char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base); -+#endif - int ss = crypto_shash_statesize(dst_tfm); - memcpy(dst_ipad, src_ipad, crypto_shash_blocksize(src->tfm)); - memcpy(dst_ipad + ss, src_ipad + ss, crypto_shash_blocksize(src->tfm)); diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index ba10ba0..4671cf1 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Feb 28 17:01:24 UTC 2024 - Stefan Dirsch + +- let's provide/obsolete nvidia-open-driver-G06 instead of + nvidia-open-driver-G06-kmp since older versions still had + conflicts to nvidia-open-driver-G06-kmp ... + +------------------------------------------------------------------- +Sat Feb 24 13:06:48 UTC 2024 - Stefan Dirsch + +- Update to 550.54.14 + * Added vGPU Host and vGPU Guest support. For vGPU Host, please + refer to the README.vgpu packaged in the vGPU Host Package for + more details. +- supersedes the following patches: + * 0001-Don-t-override-INSTALL_MOD_DIR.patch + * kernel-6.7.patch + +------------------------------------------------------------------- +Fri Feb 23 10:36:04 UTC 2024 - Stefan Dirsch + +- re-enable build of -azure kernel flavor; syntax check was wrong + +------------------------------------------------------------------- +Thu Feb 22 15:48:50 UTC 2024 - Stefan Dirsch + +- remove conflicts to nvidia-open-driver-G06-kmp, since it's now + provided instead (OMG!); add obsoletes to it as well to make + sure it gets replaced (bsc#1220196) + +------------------------------------------------------------------- +Thu Feb 22 14:02:19 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + ------------------------------------------------------------------- Mon Feb 19 16:32:51 UTC 2024 - Stefan Dirsch diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index c7a7393..c7d2bbd 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -30,7 +30,7 @@ %define compress_modules xz %endif Name: nvidia-open-driver-G06-signed -Version: 545.29.06 +Version: 550.54.14 Release: 0 Summary: NVIDIA open kernel module driver for GeForce RTX 2000 series and newer License: GPL-2.0-only AND MIT @@ -50,9 +50,7 @@ Source10: pci_ids-unsupported Source11: pesign-copy-sources Source12: pesign-spec-macros Source14: group-source-files.pl -Patch0: 0001-Don-t-override-INSTALL_MOD_DIR.patch -Patch2: persistent-nvidia-id-string.patch -Patch3: kernel-6.7.patch +Patch0: persistent-nvidia-id-string.patch BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: fdupes BuildRequires: gcc-c++ @@ -63,7 +61,7 @@ BuildRequires: pesign-obs-integration BuildRequires: zstd %ifnarch aarch64 # available on SLE, but not on ALP ... -%if !0%{?is_opensuse} && !0%{?suse_version} == 1600 +%if !0%{?is_opensuse} && 0%{?suse_version} < 1600 BuildRequires: kernel-syms-azure %endif %endif @@ -95,10 +93,8 @@ This package provides the open-source NVIDIA kernel module driver for GeForce RTX 2000 series and newer GPUs. %prep -%setup -q -n open-gpu-kernel-modules-%{version} -%patch0 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n open-gpu-kernel-modules-%{version} + set -- * mkdir source mv "$@" source/ diff --git a/open-gpu-kernel-modules-545.29.06.tar.gz b/open-gpu-kernel-modules-545.29.06.tar.gz deleted file mode 100644 index c7f8ba1..0000000 --- a/open-gpu-kernel-modules-545.29.06.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e00c615215d885813c36fafc1473d6429e95f2ab2a3059a893d404ed906113c0 -size 12958269 diff --git a/open-gpu-kernel-modules-550.54.14.tar.gz b/open-gpu-kernel-modules-550.54.14.tar.gz new file mode 100644 index 0000000..8ef51c8 --- /dev/null +++ b/open-gpu-kernel-modules-550.54.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53c40182195d99bced4113d7e981444c57e9a929b73b6e10c493cb5a96b6bc28 +size 13720314 diff --git a/pci_ids-545.29.06 b/pci_ids-550.54.14 similarity index 100% rename from pci_ids-545.29.06 rename to pci_ids-550.54.14 diff --git a/pci_ids-unsupported b/pci_ids-unsupported index 13f0218..ed3a00e 100644 --- a/pci_ids-unsupported +++ b/pci_ids-unsupported @@ -65,10 +65,11 @@ 0x1FBC NVIDIA T1200 Laptop GPU 0x1FDD NVIDIA GeForce GTX 1650 0x1FF0 NVIDIA T1000 8GB -0x1FF2 NVIDIA T400 4GB +0x1FF2 NVIDIA T400E 0x1FF9 Quadro T1000 0x20BD NVIDIA A800-SXM4-40GB 0x20F3 NVIDIA A800-SXM4-80GB +0x20FD NVIDIA AX800 0x2182 NVIDIA GeForce GTX 1660 Ti 0x2184 NVIDIA GeForce GTX 1660 0x2187 NVIDIA GeForce GTX 1650 SUPER @@ -90,6 +91,7 @@ 0x2232 NVIDIA RTX A4500 0x2233 NVIDIA RTX A5500 0x2238 NVIDIA A10M +0x2329 NVIDIA H20 0x2342 NVIDIA GH200 480GB 0x2414 NVIDIA GeForce RTX 3060 Ti 0x2420 NVIDIA GeForce RTX 3080 Ti Laptop GPU @@ -132,6 +134,7 @@ 0x2563 NVIDIA GeForce RTX 3050 Ti Laptop GPU 0x2571 NVIDIA RTX A2000 12GB 0x2582 NVIDIA GeForce RTX 3050 +0x2584 NVIDIA GeForce RTX 3050 0x25A0 NVIDIA GeForce RTX 3060 Laptop GPU 0x25A2 NVIDIA GeForce RTX 3060 Laptop GPU 0x25A5 NVIDIA GeForce RTX 3050 Laptop GPU @@ -157,20 +160,27 @@ 0x25FA NVIDIA RTX A2000 Embedded GPU 0x25FB NVIDIA RTX A500 Embedded GPU 0x2684 NVIDIA GeForce RTX 4090 +0x2685 NVIDIA GeForce RTX 4090 D 0x26B1 NVIDIA RTX 6000 Ada Generation 0x26B2 NVIDIA RTX 5000 Ada Generation +0x26B3 NVIDIA RTX 5880 Ada Generation 0x26B9 NVIDIA L40S +0x26BA NVIDIA L20 +0x2702 NVIDIA GeForce RTX 4080 SUPER 0x2704 NVIDIA GeForce RTX 4080 +0x2705 NVIDIA GeForce RTX 4070 Ti SUPER 0x2717 NVIDIA GeForce RTX 4090 Laptop GPU 0x2730 NVIDIA RTX 5000 Ada Generation Laptop GPU 0x2757 NVIDIA GeForce RTX 4090 Laptop GPU 0x2770 NVIDIA RTX 5000 Ada Generation Embedded GPU 0x2782 NVIDIA GeForce RTX 4070 Ti +0x2783 NVIDIA GeForce RTX 4070 SUPER 0x2786 NVIDIA GeForce RTX 4070 0x27A0 NVIDIA GeForce RTX 4080 Laptop GPU 0x27B0 NVIDIA RTX 4000 SFF Ada Generation 0x27B1 NVIDIA RTX 4500 Ada Generation 0x27B2 NVIDIA RTX 4000 Ada Generation +0x27B6 NVIDIA L2 0x27BA NVIDIA RTX 4000 Ada Generation Laptop GPU 0x27BB NVIDIA RTX 3500 Ada Generation Laptop GPU 0x27E0 NVIDIA GeForce RTX 4080 Laptop GPU @@ -183,6 +193,7 @@ 0x2882 NVIDIA GeForce RTX 4060 0x28A0 NVIDIA GeForce RTX 4060 Laptop GPU 0x28A1 NVIDIA GeForce RTX 4050 Laptop GPU +0x28B0 NVIDIA RTX 2000 Ada Generation 0x28B8 NVIDIA RTX 2000 Ada Generation Laptop GPU 0x28E0 NVIDIA GeForce RTX 4060 Laptop GPU 0x28E1 NVIDIA GeForce RTX 4050 Laptop GPU diff --git a/pci_ids-unsupported-545.29.06 b/pci_ids-unsupported-550.54.14 similarity index 95% rename from pci_ids-unsupported-545.29.06 rename to pci_ids-unsupported-550.54.14 index 13f0218..ed3a00e 100644 --- a/pci_ids-unsupported-545.29.06 +++ b/pci_ids-unsupported-550.54.14 @@ -65,10 +65,11 @@ 0x1FBC NVIDIA T1200 Laptop GPU 0x1FDD NVIDIA GeForce GTX 1650 0x1FF0 NVIDIA T1000 8GB -0x1FF2 NVIDIA T400 4GB +0x1FF2 NVIDIA T400E 0x1FF9 Quadro T1000 0x20BD NVIDIA A800-SXM4-40GB 0x20F3 NVIDIA A800-SXM4-80GB +0x20FD NVIDIA AX800 0x2182 NVIDIA GeForce GTX 1660 Ti 0x2184 NVIDIA GeForce GTX 1660 0x2187 NVIDIA GeForce GTX 1650 SUPER @@ -90,6 +91,7 @@ 0x2232 NVIDIA RTX A4500 0x2233 NVIDIA RTX A5500 0x2238 NVIDIA A10M +0x2329 NVIDIA H20 0x2342 NVIDIA GH200 480GB 0x2414 NVIDIA GeForce RTX 3060 Ti 0x2420 NVIDIA GeForce RTX 3080 Ti Laptop GPU @@ -132,6 +134,7 @@ 0x2563 NVIDIA GeForce RTX 3050 Ti Laptop GPU 0x2571 NVIDIA RTX A2000 12GB 0x2582 NVIDIA GeForce RTX 3050 +0x2584 NVIDIA GeForce RTX 3050 0x25A0 NVIDIA GeForce RTX 3060 Laptop GPU 0x25A2 NVIDIA GeForce RTX 3060 Laptop GPU 0x25A5 NVIDIA GeForce RTX 3050 Laptop GPU @@ -157,20 +160,27 @@ 0x25FA NVIDIA RTX A2000 Embedded GPU 0x25FB NVIDIA RTX A500 Embedded GPU 0x2684 NVIDIA GeForce RTX 4090 +0x2685 NVIDIA GeForce RTX 4090 D 0x26B1 NVIDIA RTX 6000 Ada Generation 0x26B2 NVIDIA RTX 5000 Ada Generation +0x26B3 NVIDIA RTX 5880 Ada Generation 0x26B9 NVIDIA L40S +0x26BA NVIDIA L20 +0x2702 NVIDIA GeForce RTX 4080 SUPER 0x2704 NVIDIA GeForce RTX 4080 +0x2705 NVIDIA GeForce RTX 4070 Ti SUPER 0x2717 NVIDIA GeForce RTX 4090 Laptop GPU 0x2730 NVIDIA RTX 5000 Ada Generation Laptop GPU 0x2757 NVIDIA GeForce RTX 4090 Laptop GPU 0x2770 NVIDIA RTX 5000 Ada Generation Embedded GPU 0x2782 NVIDIA GeForce RTX 4070 Ti +0x2783 NVIDIA GeForce RTX 4070 SUPER 0x2786 NVIDIA GeForce RTX 4070 0x27A0 NVIDIA GeForce RTX 4080 Laptop GPU 0x27B0 NVIDIA RTX 4000 SFF Ada Generation 0x27B1 NVIDIA RTX 4500 Ada Generation 0x27B2 NVIDIA RTX 4000 Ada Generation +0x27B6 NVIDIA L2 0x27BA NVIDIA RTX 4000 Ada Generation Laptop GPU 0x27BB NVIDIA RTX 3500 Ada Generation Laptop GPU 0x27E0 NVIDIA GeForce RTX 4080 Laptop GPU @@ -183,6 +193,7 @@ 0x2882 NVIDIA GeForce RTX 4060 0x28A0 NVIDIA GeForce RTX 4060 Laptop GPU 0x28A1 NVIDIA GeForce RTX 4050 Laptop GPU +0x28B0 NVIDIA RTX 2000 Ada Generation 0x28B8 NVIDIA RTX 2000 Ada Generation Laptop GPU 0x28E0 NVIDIA GeForce RTX 4060 Laptop GPU 0x28E1 NVIDIA GeForce RTX 4050 Laptop GPU diff --git a/preamble b/preamble index bc7b6b8..9c7d2cc 100644 --- a/preamble +++ b/preamble @@ -1,5 +1,6 @@ Requires: kernel-firmware-nvidia-gspx-G06 = %{-v*} Requires: perl-Bootloader -Conflicts: nvidia-gfxG06-kmp nvidia-driver-G06-kmp nvidia-open-driver-G06-kmp nvidia-gfxG05-kmp +Conflicts: nvidia-gfxG06-kmp nvidia-driver-G06-kmp nvidia-gfxG05-kmp Requires: group(video) -Provides: nvidia-open-driver-G06-kmp = %{-v*} +Provides: nvidia-open-driver-G06 = %{-v*} +Obsoletes: nvidia-open-driver-G06 = %{-v*}