[arch-commits] Commit in nvidia/trunk (PKGBUILD linux-4.7.patch nvidia.install)

[Jan Steffens]

    Date: Sunday, August 7, 2016 @ 20:16:21
  Author: heftig
Revision: 273470

367.35-2: prepare 4.7

Added:
  nvidia/trunk/linux-4.7.patch
Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install

-----------------+
 PKGBUILD        |   11 +++++----
 linux-4.7.patch |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 nvidia.install  |    2 -
 3 files changed, 72 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-07 20:03:26 UTC (rev 273469)
+++ PKGBUILD	2016-08-07 20:16:21 UTC (rev 273470)
@@ -6,14 +6,16 @@
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
 pkgver=367.35
-_extramodules=extramodules-4.6-ARCH
-pkgrel=1
+_extramodules=extramodules-4.7-ARCH
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.6' 'linux-headers<4.7')
+makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
 license=('custom')
 options=('!strip')
+source=('linux-4.7.patch')
+md5sums=('b1e6760dca837e8685fd02be15aa4f51')
 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_i686=('42db6f6485c3c337c7c756380ec64b7a')
@@ -26,6 +28,7 @@
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
 
+    patch -Np1 -d kernel < ../linux-4.7.patch
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
@@ -49,7 +52,7 @@
 
 package_nvidia() {
     pkgdesc="NVIDIA drivers for linux"
-    depends=('linux>=4.6' 'linux<4.7' "nvidia-utils=${pkgver}" 'libgl')
+    depends=('linux>=4.7' 'linux<4.8' "nvidia-utils=${pkgver}" 'libgl')
     install=nvidia.install
 
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \

Added: linux-4.7.patch
===================================================================
--- linux-4.7.patch	                        (rev 0)
+++ linux-4.7.patch	2016-08-07 20:16:21 UTC (rev 273470)
@@ -0,0 +1,64 @@
+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 -u -r nvidia-367.35-orig/nvidia-uvm/uvm_linux.h nvidia-367.35/nvidia-uvm/uvm_linux.h
+--- nvidia-367.35-orig/nvidia-uvm/uvm_linux.h	2016-07-15 18:58:50.000000000 +0200
++++ nvidia-367.35/nvidia-uvm/uvm_linux.h	2016-08-06 00:27:09.796678527 +0200
+@@ -554,12 +554,13 @@
+     INIT_RADIX_TREE(tree, GFP_NOWAIT);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
+ static bool radix_tree_empty(struct radix_tree_root *tree)
+ {
+     void *dummy;
+     return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0;
+ }
+-
++#endif
+ 
+ #if !defined(NV_USLEEP_RANGE_PRESENT)
+ static void __sched usleep_range(unsigned long min, unsigned long max)

Modified: nvidia.install
===================================================================
--- nvidia.install	2016-08-07 20:03:26 UTC (rev 273469)
+++ nvidia.install	2016-08-07 20:16:21 UTC (rev 273470)
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-4.6-ARCH'
+    EXTRAMODULES='extramodules-4.7-ARCH'
     depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version)
     echo 'In order to use nvidia module, reboot the system.'
 }