[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/files/, x11-drivers/nvidia-drivers/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     c82e85ffb3bae915fc2772a6c6705c0cf2b816e8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 08:06:50 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 09:02:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c82e85ff

x11-drivers/nvidia-drivers: drop obsolete kernel-6.7 patch in 535

Kind of forgot that was still there.

Still applied given it changes the code in the "if not 6.7" conditional
that nvidia started using (meaning harmless unused code).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../nvidia-drivers-535.43.22-kernel-6.7.patch      | 24 ----------------------
 .../nvidia-drivers-535.216.01-r1.ebuild            |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch
deleted file mode 100644
index 08833de8344a..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-535.43.22-kernel-6.7.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Typically opt not to patch for kernel support downstream, but in this
-case it's only conditionally broken depending on kernel crypto configs
-and USE=kernel-open, then an (official) NVIDIA representative has
-responded with a fix in [1] which should be safe.
-
-[1] https://github.com/NVIDIA/open-gpu-kernel-modules/issues/574#issuecomment-1809283181
---- a/kernel/nvidia/libspdm_shash.c
-+++ b/kernel/nvidia/libspdm_shash.c
-@@ -89,4 +89,4 @@
-         struct crypto_shash *dst_tfm = dst->tfm;
--        char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
--        char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
-+        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);
-         int ss = crypto_shash_statesize(dst_tfm);
---- a/kernel-module-source/kernel-open/nvidia/libspdm_shash.c
-+++ b/kernel-module-source/kernel-open/nvidia/libspdm_shash.c
-@@ -89,4 +89,4 @@
-         struct crypto_shash *dst_tfm = dst->tfm;
--        char *src_ipad = crypto_tfm_ctx_aligned(&src_tfm->base);
--        char *dst_ipad = crypto_tfm_ctx_aligned(&dst_tfm->base);
-+        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);
-         int ss = crypto_shash_statesize(dst_tfm);

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
index f6b99ca641ae..9e36108889c6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01-r1.ebuild
@@ -140,9 +140,6 @@ src_prepare() {
 
 	default
 
-	kernel_is -ge 6 7 &&
-		eapply "${FILESDIR}"/nvidia-drivers-535.43.22-kernel-6.7.patch
-
 	# prevent detection of incomplete kernel DRM support (bug #603818)
 	sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
 		-i kernel{,-module-source/kernel-open}/conftest.sh || die