Update

4 files changed, 63 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea4d7af1edad..00066f845441 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Jul 19 05:59:41 UTC 2016
+# Thu Aug 18 06:12:41 UTC 2016
 pkgbase = nvidia-pae
 	pkgdesc = NVIDIA drivers for linux
 	pkgver = 367.35
@@ -10,17 +10,19 @@ pkgbase = nvidia-pae
 	makedepends = nvidia-libgl
 	makedepends = nvidia-utils=367.35
 	makedepends = linux-pae
-	makedepends = linux-pae-headers>=4.6
-	makedepends = linux-pae-headers<4.7
+	makedepends = linux-pae-headers>=4.7
+	makedepends = linux-pae-headers<4.8
 	options = !strip
 	source = http://us.download.nvidia.com/XFree86/Linux-x86/367.35/NVIDIA-Linux-x86-367.35.run
+	source = 0001-linux-4.7-i686.patch
 	md5sums = 42db6f6485c3c337c7c756380ec64b7a
+	md5sums = 0ceb49f5c537ae60743fdf7177eb996e
 
 pkgname = nvidia-pae
 	pkgdesc = NVIDIA drivers for linux
 	install = nvidia.install
-	depends = linux-pae>=4.6
-	depends = linux-pae<4.7
+	depends = linux-pae>=4.7
+	depends = linux-pae<4.8
 	depends = nvidia-utils=367.35
 	depends = libgl
 
diff --git a/0001-linux-4.7-i686.patch b/0001-linux-4.7-i686.patch
new file mode 100644
index 000000000000..ec91dc405454
--- /dev/null
+++ b/0001-linux-4.7-i686.patch
@@ -0,0 +1,46 @@
+diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c nvidia-367.35/nvidia-drm/nvidia-drm-fb.c
+--- nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c	2016-07-15 18:58:50.000000000 +0200
++++ nvidia-367.35/nvidia-drm/nvidia-drm-fb.c	2016-08-06 00:38:00.550651165 +0200
+@@ -31,6 +31,7 @@
+ #include "nvidia-drm-gem.h"
+ 
+ #include <drm/drm_crtc_helper.h>
++#include <linux/version.h>
+ 
+ static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb)
+ {
+@@ -114,7 +115,11 @@
+      * We don't support any planar format, pick up first buffer only.
+      */
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++    gem = drm_gem_object_lookup(file, cmd->handles[0]);
++#else
+     gem = drm_gem_object_lookup(dev, file, cmd->handles[0]);
++#endif
+ 
+     if (gem == NULL)
+     {
+diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c nvidia-367.35/nvidia-drm/nvidia-drm-gem.c
+--- nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c	2016-07-15 18:58:50.000000000 +0200
++++ nvidia-367.35/nvidia-drm/nvidia-drm-gem.c	2016-08-06 00:37:47.237546102 +0200
+@@ -27,6 +27,7 @@
+ #include "nvidia-drm-priv.h"
+ #include "nvidia-drm-ioctl.h"
+ #include "nvidia-drm-gem.h"
++#include <linux/version.h>
+ 
+ static struct nvidia_drm_gem_object *nvidia_drm_gem_new
+ (
+@@ -408,7 +409,11 @@
+ 
+     mutex_lock(&dev->struct_mutex);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
++    gem = drm_gem_object_lookup(file, handle);
++#else
+     gem = drm_gem_object_lookup(dev, file, handle);
++#endif
+ 
+     if (gem == NULL)
+     {
diff --git a/PKGBUILD b/PKGBUILD
index 403d75e3c69c..d8d7b27fbe25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,18 @@
 pkgbase=nvidia-pae
 pkgname=(nvidia-pae nvidia-pae-dkms)
 pkgver=367.35
-_extramodules=extramodules-4.6-pae
+_extramodules=extramodules-4.7-pae
 pkgrel=1
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686')
 url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-pae' 'linux-pae-headers>=4.6' 'linux-pae-headers<4.7')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-pae' 'linux-pae-headers>=4.7' 'linux-pae-headers<4.8')
 license=('custom')
 options=('!strip')
 # See nvidia-utils
-source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
-md5sums=('42db6f6485c3c337c7c756380ec64b7a')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" 0001-linux-4.7-i686.patch)
+md5sums=('42db6f6485c3c337c7c756380ec64b7a'
+         '0ceb49f5c537ae60743fdf7177eb996e')
 
 _pkg="NVIDIA-Linux-x86-${pkgver}"
 
@@ -24,6 +25,7 @@ prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
+    patch -Np1 -d kernel < ../0001-linux-4.7-i686.patch
 
     cp -a kernel kernel-dkms
     cd kernel-dkms
@@ -48,7 +50,7 @@ build() {
 
 package_nvidia-pae() {
     pkgdesc="NVIDIA drivers for linux"
-    depends=('linux-pae>=4.6' 'linux-pae<4.7' "nvidia-utils=${pkgver}" 'libgl')
+    depends=('linux-pae>=4.7' 'linux-pae<4.8' "nvidia-utils=${pkgver}" 'libgl')
     install=nvidia.install
 
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
@@ -58,11 +60,6 @@ package_nvidia-pae() {
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-drm.ko" \
          "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-drm.ko"
 
-    if [[ "$CARCH" = "x86_64" ]]; then
-        install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia-uvm.ko" \
-            "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
-    fi
-
     gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
     install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
 
diff --git a/nvidia.install b/nvidia.install
index 57e3aea88151..8347405aab26 100644
--- a/nvidia.install
+++ b/nvidia.install
@@ -1,16 +1,16 @@
 post_install() {
-  EXTRAMODULES='extramodules-4.6-pae'
+  EXTRAMODULES='extramodules-4.7-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-4.6-pae'
+  EXTRAMODULES='extramodules-4.7-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
   rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-4.6-pae'
+  EXTRAMODULES='extramodules-4.7-pae'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }