Upgpkg: 381.22

3 files changed, 14 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 96970af091be..e0e855b388f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
-# Generated by mksrcinfo v8
-# Mon May  1 07:43:44 UTC 2017
 pkgbase = nvidia-beta-all
 	pkgdesc = NVIDIA drivers for all kernels on the system (beta)
-	pkgver = 381.09
-	pkgrel = 2
+	pkgver = 381.22
+	pkgrel = 1
 	url = http://www.nvidia.com/
 	install = nvidia-beta-all.install
 	arch = i686
 	arch = x86_64
 	license = custom:NVIDIA
 	makedepends = linux-headers
-	depends = nvidia-utils-beta>=381.09
+	depends = nvidia-utils-beta>=381.22
 	depends = libgl
-	provides = nvidia=381.09
+	provides = nvidia=381.22
 	conflicts = nvidia-96xx
 	conflicts = nvidia-173xx
 	conflicts = nvidia
 	options = !strip
-	source = linux-4.11.patch
-	md5sums = 897d9775dc484ab37934e7b102c5b325
-	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.09/NVIDIA-Linux-x86-381.09.run
-	md5sums_i686 = aa16257e2ab1c28724479165afc187cc
-	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.09/NVIDIA-Linux-x86_64-381.09-no-compat32.run
-	md5sums_x86_64 = fe66660415e3919681e61bfc4e95cba4
+	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run
+	md5sums_i686 = 8825cec1640739521689bd80121d1425
+	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22-no-compat32.run
+	md5sums_x86_64 = 0e9590d48703c8baa034b6f0f8bbf1e5
 
 pkgname = nvidia-beta-all
 
diff --git a/PKGBUILD b/PKGBUILD
index 606fe77873d3..ec020a562bb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Based on nvidia-beta: https://aur.archlinux.org/packages/nvidia-beta/
 
 pkgname=nvidia-beta-all
-pkgver=381.09
-pkgrel=2
+pkgver=381.22
+pkgrel=1
 pkgdesc="NVIDIA drivers for all kernels on the system (beta)"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,12 +23,12 @@ case "$CARCH" in
 esac
 
 # Source
-source=('linux-4.11.patch')
+#source=('linux-4.11.patch')
 source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/$pkgver/NVIDIA-Linux-x86-$pkgver.run")
 source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/NVIDIA-Linux-x86_64-$pkgver-no-compat32.run")
-md5sums=('897d9775dc484ab37934e7b102c5b325')
-md5sums_i686=('aa16257e2ab1c28724479165afc187cc')
-md5sums_x86_64=('fe66660415e3919681e61bfc4e95cba4')
+#md5sums=('897d9775dc484ab37934e7b102c5b325')
+md5sums_i686=('8825cec1640739521689bd80121d1425')
+md5sums_x86_64=('0e9590d48703c8baa034b6f0f8bbf1e5')
 
 # Auto-detect patches (e.g. linux-4.1.patch)
 for _patch in $(find "$startdir" -maxdepth 1 -name '*.patch' -printf "%f\n"); do
diff --git a/linux-4.11.patch b/linux-4.11.patch
deleted file mode 100644
index 5951face36ed..000000000000
--- a/linux-4.11.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-drv.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-drv.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-drv.c	2017-04-06 23:53:14.273356795 +0200
-@@ -48,6 +48,8 @@
- #include <drm/drm_auth.h>
- #endif
- 
-+#include <linux/version.h>
-+
- static struct nvidia_drm_device *dev_list = NULL;
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -398,7 +400,11 @@
-     return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_unload(struct drm_device *dev)
-+#else
-+static void nvidia_drm_unload(struct drm_device *dev)
-+#endif
- {
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-     struct NvKmsKapiDevice *pDevice = NULL;
-@@ -412,7 +418,11 @@
- 
-     if (!nvidia_drm_modeset_enabled(dev))
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-         return 0;
-+#else
-+        return;
-+#endif
-     }
- 
-     mutex_lock(&nv_dev->lock);
-@@ -445,7 +455,11 @@
- 
- #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     return 0;
-+#else
-+    return;
-+#endif
- }
- 
- #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
-@@ -542,7 +556,6 @@
-                                             void *data,
-                                             struct drm_file *file_priv)
- {
--    struct nvidia_drm_device *nv_dev = dev->dev_private;
-     struct drm_nvidia_get_client_capability_params *params = data;
- 
-     switch (params->capability)
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-gem.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-gem.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-gem.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-gem.c	2017-04-06 23:54:19.624353181 +0200
-@@ -31,6 +31,8 @@
- 
- #include "nv-mm.h"
- 
-+#include <linux/version.h>
-+
- static struct nvidia_drm_gem_object *nvidia_drm_gem_new
- (
-     struct drm_file *file_priv,
-@@ -511,11 +513,19 @@
-  * Note that nvidia_drm_vma_fault() can be called for different or same
-  * ranges of the same drm_gem_object simultaneously.
-  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
- static int nvidia_drm_vma_fault(struct vm_area_struct *vma,
-                                 struct vm_fault *vmf)
-+#else
-+static int nvidia_drm_vma_fault(struct vm_fault *vmf)
-+#endif
- {
-     unsigned long address = nv_page_fault_va(vmf);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     struct drm_gem_object *gem = vma->vm_private_data;
-+#else
-+    struct drm_gem_object *gem = vmf->vma->vm_private_data;
-+#endif
-     struct nvidia_drm_gem_object *nv_gem =
-                     DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);
-     unsigned long page_offset, pfn;
-@@ -526,7 +536,11 @@
- 
-     page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
-     ret = vm_insert_pfn(vma, address, pfn + page_offset);
-+#else
-+    ret = vm_insert_pfn(vmf->vma, address, pfn + page_offset);
-+#endif
- 
-     switch (ret) {
-         case 0:
-diff -ur NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-linux.c NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-linux.c
---- NVIDIA-Linux-x86_64-381.09/kernel/nvidia-drm/nvidia-drm-linux.c	2017-03-31 03:42:21.000000000 +0200
-+++ NVIDIA-Linux-x86_64-381.09.patched/kernel/nvidia-drm/nvidia-drm-linux.c	2017-04-06 23:53:14.273356795 +0200
-@@ -185,7 +185,7 @@
- module_exit(nv_linux_drm_exit);
- 
- #if defined(MODULE_LICENSE)
--  MODULE_LICENSE("MIT");
-+  MODULE_LICENSE("Dual MIT/GPL");
- #endif
- #if defined(MODULE_INFO)
-   MODULE_INFO(supported, "external");