update for 5.7

3 files changed, 63 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad2de43e4629..356af11ca251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-390xx
 	pkgdesc = NVIDIA drivers for linux, 390xx legacy branch
 	pkgver = 390.132
-	pkgrel = 36
+	pkgrel = 37
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -14,10 +14,12 @@ pkgbase = nvidia-390xx
 	source = kernel-4.16.patch
 	source = kernel-5.5.patch
     source = kernel-5.6.patch
+    source = kernel-5.7.patch
 	sha256sums = b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d
 	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
 	sha256sums = c72d89546b6dbd332e678800e48acbcdb29c1e1f23f986f77cee2c46b1a91e75
     sha256sums = 9e820398ad71c6ea14a8efc6b0f61a38000971c00a5ac4e5959686569dabb3c7
+    sha256sums = ebe1505ea53975de41d15558327b342ece59f564af367a3050711e3f4183cc87
 
 pkgname = nvidia-390xx
 	pkgdesc = NVIDIA drivers for linux, 390xx legacy branch
diff --git a/PKGBUILD b/PKGBUILD
index 612ed3bf0c94..21b36e827c8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=nvidia-390xx
 pkgname=(nvidia-390xx nvidia-390xx-dkms)
 pkgver=390.132
-pkgrel=36
+pkgrel=37
 pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
 arch=('x86_64')
 url="https://www.nvidia.com/"
@@ -18,11 +18,13 @@ _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
         'kernel-4.16.patch'
         'kernel-5.5.patch'
-        'kernel-5.6.patch')
+        'kernel-5.6.patch'
+        'kernel-5.7.patch')
 sha256sums=('b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d'
             '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
             'c72d89546b6dbd332e678800e48acbcdb29c1e1f23f986f77cee2c46b1a91e75'
-            '9e820398ad71c6ea14a8efc6b0f61a38000971c00a5ac4e5959686569dabb3c7')
+            '9e820398ad71c6ea14a8efc6b0f61a38000971c00a5ac4e5959686569dabb3c7'
+            'ebe1505ea53975de41d15558327b342ece59f564af367a3050711e3f4183cc87')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
@@ -38,6 +40,9 @@ prepare() {
     # Patch to make it compile under linux 5.6
     patch -Np1 -i ../kernel-5.6.patch
 
+    # Patch to make it compile under linux 5.7 - Courtesy of jopadan
+    patch -Np1 -i ../kernel-5.7.patch
+
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
diff --git a/kernel-5.7.patch b/kernel-5.7.patch
new file mode 100644
index 000000000000..8ff733b9cd6c
--- /dev/null
+++ b/kernel-5.7.patch
@@ -0,0 +1,52 @@
+--- a/kernel/conftest.sh	2020-06-02 22:58:18.105955835 +0200
++++ b/kernel/conftest.sh	2020-06-02 22:52:18.043929185 +0200
+@@ -434,6 +434,21 @@
+             compile_check_conftest "$CODE" "NV_SET_MEMORY_ARRAY_UC_PRESENT" "" "functions"
+         ;;
+ 
++	set_pages_array_uc)
++            #
++            # Determine if the set_pages_array_uc() function is present.
++            #
++            CODE="
++            #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
++            #include <asm/set_memory.h>
++            #endif
++            void conftest_set_pages_array_uc(void) {
++                set_pages_array_uc();
++            }"
++
++            compile_check_conftest "$CODE" "NV_SET_PAGES_ARRAY_UC_PRESENT" "" "functions"
++	;;
++
+         sysfs_slab_unlink)
+             #
+             # Determine if the sysfs_slab_unlink() function is present.
+--- a/kernel/nvidia/nv-vm.c	2020-06-02 22:58:17.379955781 +0200
++++ b/kernel/nvidia/nv-vm.c	2020-06-02 22:56:22.865947306 +0200
+@@ -81,7 +81,14 @@
+ {
+     switch (type)
+     {
+-#if defined(NV_SET_MEMORY_ARRAY_UC_PRESENT)
++#if defined(NV_SET_PAGES_ARRAY_UC_PRESENT)
++        case NV_MEMORY_UNCACHED:
++            set_pages_array_uc((struct page**)&pages, num_pages);
++            break;
++        case NV_MEMORY_WRITEBACK:
++            set_pages_array_wb((struct  page**)&pages, num_pages);
++            break;
++#elif defined(NV_SET_MEMORY_ARRAY_UC_PRESENT)
+         case NV_MEMORY_UNCACHED:
+             set_memory_array_uc(pages, num_pages);
+             break;
+--- a/kernel/nvidia/nvidia.Kbuild	2020-06-02 23:35:16.595120035 +0200
++++ b/kernel/nvidia/nvidia.Kbuild	2020-06-02 23:35:10.096119554 +0200
+@@ -105,6 +105,7 @@
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += list_is_first
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_memory_uc
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_memory_array_uc
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_pages_array_uc
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += change_page_attr
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_get_class
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_choose_state