Update to 340.104-6

3 files changed, 50 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1e739bd91bc..9bf3312b9b23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
 # Generated by mksrcinfo v8
-# Tue Nov 21 19:18:50 UTC 2017
+# Tue Nov 21 20:30:52 UTC 2017
 pkgbase = nvidia-340xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch.
 	pkgver = 340.104
 	pkgrel = 6
 	url = http://www.nvidia.com/
-	install = readme.install
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = linux-ck-headers>=4.14
@@ -20,7 +18,11 @@ pkgbase = nvidia-340xx-ck
 	conflicts = nvidia-304xx-ck
 	options = !strip
 	source = http://us.download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104-no-compat32.run
+	source = kernel-4.11.patch
+	source = kernel-4.14.patch
 	sha256sums = ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada
+	sha256sums = 5ba7e6d5e502882c3534d1d8578f7fd29fdf3d2aeb49206efa7b3514a7e3e821
+	sha256sums = dd9d17fbb29371ebb51d64ac2f5ec58fde2fce919fb49d95038cde064567c5d7
 
 pkgname = nvidia-340xx-ck
 
diff --git a/PKGBUILD b/PKGBUILD
index 30d4dc5a771d..2408b2fb9465 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=340.104
 _extramodules=extramodules-4.14-ck
 pkgrel=6
 pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.nvidia.com/"
 depends=('linux-ck>=4.14' 'linux-ck<4.15' 'libgl' "nvidia-340xx-utils=${pkgver}")
 makedepends=('linux-ck-headers>=4.14' 'linux-ck-headers<4.15' 'nvidia-340xx-libgl')
@@ -14,11 +14,14 @@ conflicts=('nvidia-ck' 'nvidia-304xx-ck')
 #groups=('ck-generic')
 #replaces=()
 license=('custom')
-install=readme.install
 options=(!strip)
-source=('kernel-4.11.patch')
-source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha256sums=('ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+'kernel-4.11.patch'
+'kernel-4.14.patch'
+)
+sha256sums=('ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada'
+            '5ba7e6d5e502882c3534d1d8578f7fd29fdf3d2aeb49206efa7b3514a7e3e821'
+            'dd9d17fbb29371ebb51d64ac2f5ec58fde2fce919fb49d95038cde064567c5d7')
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
 prepare() {
@@ -27,6 +30,7 @@ prepare() {
   
   # patches here
   patch -Np0 < "${srcdir}/kernel-4.11.patch"
+  patch -Np1 < "${srcdir}/kernel-4.14.patch"
 }
 
 build() {
@@ -39,13 +43,13 @@ build() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-    "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
-  install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
-    "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
-  gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
-  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-  echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-340xx-ck.conf"
+  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+    "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+  find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+  echo "blacklist nouveau" |
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia-ck.conf"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/kernel-4.14.patch b/kernel-4.14.patch
new file mode 100644
index 000000000000..a38adbd42a9d
--- /dev/null
+++ b/kernel-4.14.patch
@@ -0,0 +1,29 @@
+diff -u -r NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c
+--- NVIDIA-Linux-x86_64-340.104-no-compat32/kernel/nv-drm.c	2017-09-15 01:16:51.000000000 +0200
++++ NVIDIA-Linux-x86_64-340.104-no-compat32-kernel4.14/kernel/nv-drm.c	2017-11-19 00:51:45.006654148 +0100
+@@ -173,8 +173,12 @@
+ {
+     int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+     ret = drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+     return ret;
+ }
+ 
+@@ -183,8 +187,12 @@
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+     drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }
+ 
+ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(