Bump to 4.5.7-1

4 files changed, 67 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f514611a223..5b0bbdeff593 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 # Generated by mksrcinfo v8
-# Fri Apr 22 23:06:09 UTC 2016
+# Wed Jun  8 11:04:24 UTC 2016
 pkgbase = nvidia-lqx
 	pkgdesc = NVIDIA drivers for linux-lqx
 	pkgver = 364.19
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.nvidia.com/
 	install = nvidia-lqx.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-lqx-headers>=4.5
-	makedepends = linux-lqx-headers<4.6
-	depends = linux-lqx>=4.5
-	depends = linux-lqx<4.6
+	makedepends = linux-lqx-headers>=4.6
+	makedepends = linux-lqx-headers<4.7
+	depends = linux-lqx>=4.6
+	depends = linux-lqx<4.7
 	depends = nvidia-libgl
 	depends = nvidia-utils=364.19
 	conflicts = nvidia-304xx-lqx
 	conflicts = nvidia-340xx-lqx
 	options = !strip
+	source = linux-4.6.patch
+	md5sums = 3064bd437b26adac246f301f54f2814c
 	source_i686 = http://us.download.nvidia.com/XFree86/Linux-x86/364.19/NVIDIA-Linux-x86-364.19.run
 	md5sums_i686 = 8a4015213c4a8f1c80e9520d04a32a7b
 	source_x86_64 = http://us.download.nvidia.com/XFree86/Linux-x86_64/364.19/NVIDIA-Linux-x86_64-364.19-no-compat32.run
diff --git a/PKGBUILD b/PKGBUILD
index b10c082105aa..b290d742f10e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
 # Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com> PGP-Key: 78695CFD
-# Contributor: shivik <> PGP-Key: 761E4.5C
+# Contributor: shivik <> PGP-Key: 761E4.6C
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=nvidia-lqx
 pkgver=364.19
-_extramodules=extramodules-4.5-lqx
-pkgrel=1
+_extramodules=extramodules-4.6-lqx
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux-lqx"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-lqx>=4.5' 'linux-lqx<4.6' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-lqx-headers>=4.5' 'linux-lqx-headers<4.6')
+depends=('linux-lqx>=4.6' 'linux-lqx<4.7' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-lqx-headers>=4.6' 'linux-lqx-headers<4.7')
 conflicts=('nvidia-304xx-lqx' 'nvidia-340xx-lqx')
 license=('custom')
 install=nvidia-lqx.install
 options=(!strip)
 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")
+source=('linux-4.6.patch')
 md5sums_i686=('8a4015213c4a8f1c80e9520d04a32a7b')
 md5sums_x86_64=('ad7a0b1855b3913390fb75b4cc3a26dc')
+md5sums=('3064bd437b26adac246f301f54f2814c')
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
@@ -26,6 +28,7 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
+    patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
 }
 
 build() {
diff --git a/linux-4.6.patch b/linux-4.6.patch
new file mode 100644
index 000000000000..3dde4730532b
--- /dev/null
+++ b/linux-4.6.patch
@@ -0,0 +1,50 @@
+--- a/kernel/nvidia-drm/nvidia-drm-fb.c

++++ b/kernel/nvidia-drm/nvidia-drm-fb.c

+@@ -77,7 +77,7 @@

+ static struct drm_framebuffer *internal_framebuffer_create

+ (

+     struct drm_device *dev,

+-    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd,

++    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd,

+     uint64_t nvkms_params_ptr,

+     uint64_t nvkms_params_size

+ )

+@@ -199,7 +199,7 @@

+ struct drm_framebuffer *nvidia_drm_framebuffer_create

+ (

+     struct drm_device *dev,

+-    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd

++    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd

+ )

+ {

+     return internal_framebuffer_create(dev, file, cmd, 0, 0);

+--- a/kernel/nvidia-drm/nvidia-drm-fb.h

++++ b/kernel/nvidia-drm/nvidia-drm-fb.h

+@@ -45,7 +45,7 @@

+ struct drm_framebuffer *nvidia_drm_framebuffer_create

+ (

+     struct drm_device *dev,

+-    struct drm_file *file, struct drm_mode_fb_cmd2 *cmd

++    struct drm_file *file, const struct drm_mode_fb_cmd2 *cmd

+ );

+ 

+ int nvidia_drm_add_nvkms_fb(

+--- a/kernel/nvidia-drm/nvidia-drm-linux.c

++++ b/kernel/nvidia-drm/nvidia-drm-linux.c

+@@ -31,6 +31,7 @@

+ 

+ #if defined(NV_DRM_AVAILABLE)

+ 

++#include "nv-mm.h"

+ #include "nv-pgprot.h"

+ 

+ MODULE_PARM_DESC(

+@@ -121,8 +122,7 @@

+ 

+     down_read(&mm->mmap_sem);

+ 

+-    pages_pinned = get_user_pages(current, mm,

+-                                  address, pages_count, write, force,

++    pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,

+                                   user_pages, NULL);

+     up_read(&mm->mmap_sem);
\ No newline at end of file
diff --git a/nvidia-lqx.install b/nvidia-lqx.install
index 51cd64103608..3460632b92ea 100644
--- a/nvidia-lqx.install
+++ b/nvidia-lqx.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.5-lqx'
+    EXTRAMODULES='extramodules-4.6-lqx'
     depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
     echo 'In order to use nvidia module, reboot the system.'
 }