From 830615862352bbc187cc83061c6ad53e8e264b3e Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Sat, 11 Jul 2020 10:17:11 +0200
Subject: [PATCH] Split kernel 5.8 patch for <450.57

---
 PKGBUILD                 | 16 +++++++++++++---
 patches/5.8-legacy.diff  | 18 ++++++++++++++++++
 patches/kernel-5.8.patch | 18 ------------------
 3 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 patches/5.8-legacy.diff

diff --git a/PKGBUILD b/PKGBUILD
index 29afd5e..7f98a74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -151,7 +151,7 @@ fi
 
 pkgname=("${_pkgname_array[@]}")
 pkgver=$_driver_version
-pkgrel=119
+pkgrel=120
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom:NVIDIA')
@@ -196,6 +196,7 @@ source=($_source_name
         '5.6-ioremap.diff' # 5.6 additional ioremap workaround (<440.64)
         'kernel-5.7.patch' # 5.7 workaround
         'kernel-5.8.patch' # 5.8 workaround
+        '5.8-legacy.diff' # 5.8 additional vmalloc workaround (<450.57)
 )
 
 msg2 "Selected driver integrity check behavior (md5sum or SKIP): $_md5sum" # If the driver is "known", return md5sum. If it isn't, return SKIP
@@ -221,7 +222,8 @@ md5sums=("$_md5sum"
          '84dc2d2eff2846b2f961388b153e2a89'
          '1f11f5c765e42c471b202e630e3cd407'
          'd911a0531c6f270926cacabd1dd80f02'
-         'd1907c16b373e853018eec3232469744')
+         '589dfc0c801605018b7ccd690f06141a'
+         'd67bf0a9aa5c19f07edbaf6bd157d661')
 
 if [ "$_autoaddpatch" = "true" ]; then
   # Auto-add *.patch files from $startdir to source=()
@@ -444,7 +446,11 @@ DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
     # 5.8
     if (( $(vercmp "$_kernel" "5.8") >= 0 )); then
       _kernel58="1"
-      _whitelist58=( 396* 410* 415* 418* 430* 435* 440* 450.3* 450.51 )
+      _whitelist58=( 396* 410* 415* 418* 430* 435* 440* 450.3* 450.51 450.56.01 )
+      if [[ $pkgver = 396* ]] || [[ $pkgver = 41* ]] || [[ $pkgver = 43* ]] || [[ $pkgver = 44* ]] || [[ $pkgver = 450.3* ]] || [[ $pkgver = 450.51 ]]; then
+        msg2 "Applying 5.8-legacy.diff for $_kernel..."
+        patch -Np1 -i "$srcdir"/5.8-legacy.diff
+      fi
     fi
 
     # Loop patches (linux-4.15.patch, lol.patch, ...)
@@ -691,6 +697,10 @@ DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
       else
         msg2 "Skipping kernel-5.8.patch as it doesn't apply to this driver version..."
       fi
+      if [[ $pkgver = 396* ]] || [[ $pkgver = 41* ]] || [[ $pkgver = 43* ]] || [[ $pkgver = 44* ]] || [[ $pkgver = 450.3* ]] || [[ $pkgver = 450.51 ]]; then
+        msg2 "Applying 5.8-legacy.diff for dkms..."
+        patch -Np1 -i "$srcdir"/5.8-legacy.diff
+      fi
     fi
 
     # Legacy quirks
diff --git a/patches/5.8-legacy.diff b/patches/5.8-legacy.diff
new file mode 100644
index 0000000..ef7a55a
--- /dev/null
+++ b/patches/5.8-legacy.diff
@@ -0,0 +1,18 @@
+diff --git a/kernel-dkms/common/inc/nv-linux.h b/kernel-dkms/common/inc/nv-linux.h
+index 70d336d..c31ec94 100644
+--- a/kernel-dkms/common/inc/nv-linux.h
++++ b/kernel-dkms/common/inc/nv-linux.h
+@@ -509,7 +509,13 @@ extern NvBool nvos_is_chipset_io_coherent(void);
+ 
+ static inline void *nv_vmalloc(unsigned long size)
+ {
++#if NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 3
+     void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
++#elif NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 2
++    void *ptr = __vmalloc(size, GFP_KERNEL);
++#else
++#error "NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT value unrecognized!"
++#endif
+     if (ptr)
+         NV_MEMDBG_ADD(ptr, size);
+     return ptr; 
diff --git a/patches/kernel-5.8.patch b/patches/kernel-5.8.patch
index 2a80268..6651e67 100644
--- a/patches/kernel-5.8.patch
+++ b/patches/kernel-5.8.patch
@@ -1,21 +1,3 @@
-diff --git a/kernel-dkms/common/inc/nv-linux.h b/kernel-dkms/common/inc/nv-linux.h
-index 70d336d..c31ec94 100644
---- a/kernel-dkms/common/inc/nv-linux.h
-+++ b/kernel-dkms/common/inc/nv-linux.h
-@@ -509,7 +509,13 @@ extern NvBool nvos_is_chipset_io_coherent(void);
- 
- static inline void *nv_vmalloc(unsigned long size)
- {
-+#if NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 3
-     void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
-+#elif NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT == 2
-+    void *ptr = __vmalloc(size, GFP_KERNEL);
-+#else
-+#error "NV_VMALLOC_ARGUMENT_COUNT_ARGUMENT_COUNT value unrecognized!"
-+#endif
-     if (ptr)
-         NV_MEMDBG_ADD(ptr, size);
-     return ptr;
 diff --git a/kernel-dkms/common/inc/nv-mm.h b/kernel-dkms/common/inc/nv-mm.h
 index 4d75de0..0174626 100644
 --- a/kernel-dkms/common/inc/nv-mm.h