From 5b6fafdb88724180bdf9e080a313cf1a255ce28f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 1 Jan 2021 00:25:35 +0000
Subject: sys-kernel/nvidia-drivers-dkms && x11-drivers/nvidia-drivers &&
 x11-misc/nvidia-settings : version bump

---
 .../files/nvidia-drivers-dkms-440.82-conf.patch    | 28 ---------------
 ...vidia-drivers-dkms-455.45.01-dkms-kmalloc.patch | 40 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 28 deletions(-)
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.82-conf.patch
 create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch

(limited to 'sys-kernel/nvidia-drivers-dkms/files')

diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.82-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.82-conf.patch
deleted file mode 100644
index 8c4a9020..00000000
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-440.82-conf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
---- a/kernel/dkms.conf	2019-05-09 19:10:50.000000000 +0100
-+++ b/kernel/dkms.conf	2019-06-22 16:04:07.646270011 +0100
-@@ -1,12 +1,20 @@
--PACKAGE_NAME="nvidia"
--PACKAGE_VERSION="__VERSION_STRING"
-+PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="440.82"
- AUTOINSTALL="yes"
- 
- # By default, DKMS will add KERNELRELEASE to the make command line; however,
- # this will cause the kernel module build to infer that it was invoked via
- # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
- # the 'make' command name to suppress this behavior.
--MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
-+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
- 
- # The list of kernel modules will be generated by nvidia-installer at runtime.
--__DKMS_MODULES
-+BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/extra/dkms"
-+BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/extra/dkms"
-+BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/extra/dkms"
-+BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/extra/dkms"
-+
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch
new file mode 100644
index 00000000..c3e9fbfb
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-455.45.01-dkms-kmalloc.patch
@@ -0,0 +1,40 @@
+--- a/kernel/dkms.conf	2020-11-05 22:50:01.000000000 +0000
++++ b/kernel/dkms.conf	2020-12-31 22:26:00.878993419 +0000
+@@ -1,12 +1,20 @@
+-PACKAGE_NAME="nvidia"
+-PACKAGE_VERSION="__VERSION_STRING"
++PACKAGE_NAME="nvidia-drivers-dkms"
++PACKAGE_VERSION="455.45.01"
+ AUTOINSTALL="yes"
+ 
+ # By default, DKMS will add KERNELRELEASE to the make command line; however,
+ # this will cause the kernel module build to infer that it was invoked via
+ # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting
+ # the 'make' command name to suppress this behavior.
+-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} IGNORE_CC_MISMATCH='__IGNORE_CC_MISMATCH' modules"
+ 
+ # The list of kernel modules will be generated by nvidia-installer at runtime.
+-__DKMS_MODULES
++BUILT_MODULE_NAME[0]="nvidia"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
++BUILT_MODULE_NAME[1]="nvidia-uvm"
++DEST_MODULE_LOCATION[1]="/extra/dkms"
++BUILT_MODULE_NAME[2]="nvidia-modeset"
++DEST_MODULE_LOCATION[2]="/extra/dkms"
++BUILT_MODULE_NAME[3]="nvidia-drm"
++DEST_MODULE_LOCATION[3]="/extra/dkms"
++
+--- a/kernel/nvidia-modeset/nvidia-modeset-linux.c	2020-11-05 23:19:28.000000000 +0000
++++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c	2020-12-31 22:27:16.878028504 +0000
+@@ -282,8 +282,8 @@
+  * are called while nvkms_lock is held.
+  *************************************************************************/
+ 
+-/* Don't use kmalloc for allocations larger than 128k */
+-#define KMALLOC_LIMIT (128 * 1024)
++/* Don't use kmalloc for allocations larger than one page */
++#define KMALLOC_LIMIT PAGE_SIZE
+ 
+ void* NVKMS_API_CALL nvkms_alloc(size_t size, NvBool zero)
+ {
-- 
cgit v1.2.3