Update to 390.87-5

3 files changed, 75 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b4ae2ebf231..c3afd1a98350 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Nov  5 01:15:37 UTC 2018
+# Tue Nov 13 18:13:02 UTC 2018
 pkgbase = nvidia-390xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch.
 	pkgver = 390.87
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -20,9 +20,11 @@ pkgbase = nvidia-390xx-ck
 	options = !strip
 	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87-no-compat32.run
 	source = kernel-4.16.patch
+	source = kernel-4.19.patch
 	source = unfuck.patch
 	sha256sums = c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66
 	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
+	sha256sums = e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431
 	sha256sums = fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080
 
 pkgname = nvidia-390xx-ck
diff --git a/PKGBUILD b/PKGBUILD
index 50000d81212d..703f55426e7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=nvidia-390xx-ck
 pkgver=390.87
-pkgrel=4
+pkgrel=5
 _extramodules=extramodules-ck
 _pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch."
 pkgdesc="$_pkgdesc"
@@ -18,10 +18,10 @@ conflicts=('nvidia-340xx-ck' 'nvidia-ck')
 license=('custom')
 options=('!strip')
 source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-kernel-4.16.patch
-unfuck.patch)
+kernel-4.16.patch kernel-4.19.patch unfuck.patch)
 sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
             '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
+            'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431'
             'fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080')
 
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -33,6 +33,11 @@ prepare() {
     # Restore phys_to_dma support (still needed for 396.18)
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
+
+    # Ad-hoc patch
+    patch -Np1 -i ../kernel-4.19.patch
+    
+    # https://bugs.archlinux.org/task/59199
     patch -Np1 -i ../unfuck.patch
 }
 
diff --git a/kernel-4.19.patch b/kernel-4.19.patch
new file mode 100644
index 000000000000..57a7259e9650
--- /dev/null
+++ b/kernel-4.19.patch
@@ -0,0 +1,63 @@
+diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
+--- a/kernel/conftest.sh	2018-11-01 11:00:14.429126159 +0000
++++ b/kernel/conftest.sh	2018-11-01 11:03:08.199579458 +0000
+@@ -2372,8 +2372,13 @@
+             #
+             CODE="
+             #include <drm/drmP.h>
++            #include <linux/version.h>
+             void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
++            #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+                 drm_mode_connector_list_update(
++            #else
++                drm_connector_list_update(
++            #endif
+                     NULL,  /* struct drm_connector *connector */
+                     true); /* bool merge_type_bits */
+             }"
+diff -u -r a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c	2018-11-01 11:08:14.643715031 +0000
+@@ -34,6 +34,7 @@
+ 
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+ 
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+@@ -226,7 +227,11 @@
+ 
+ 
+     if (nv_connector->edid != NULL) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+         drm_mode_connector_update_edid_property(
++#else
++        drm_connector_update_edid_property(
++#endif
+             connector, nv_connector->edid);
+     }
+ 
+diff -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-11-01 11:08:32.210427737 +0000
+@@ -34,6 +34,7 @@
+ 
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+ 
+ static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
+ {
+@@ -216,7 +217,11 @@
+ 
+     /* Attach encoder and connector */
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+     ret = drm_mode_connector_attach_encoder(connector, encoder);
++#else
++    ret = drm_connector_attach_encoder(connector, encoder);
++#endif
+ 
+     if (ret != 0) {
+         NV_DRM_DEV_LOG_ERR(