Update for kernel 4.1.x

5 files changed, 108 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6df572fe3ec..088f3cd9df35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,27 @@
 pkgbase = nvidia-340xx-rt
-	pkgdesc = NVIDIA 340xx drivers for linux-rt.
+	pkgdesc = NVIDIA drivers for linux-rt, 340xx legacy branch
 	pkgver = 340.76
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.nvidia.com/
-	install = nvidia.install
+	install = nvidia-340xx-rt.install
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-rt>=4.0
-	makedepends = linux-rt<4.1
-	depends = linux-rt>=4.0
-	depends = linux-rt<4.1
-	depends = nvidia-340xx-utils
-	conflicts = nvidia-96xx
-	conflicts = nvidia-173xx
+	makedepends = linux-rt-headers>=4.1
+	makedepends = linux-rt-headers<4.2
+	depends = linux-rt>=4.1
+	depends = linux-rt<4.2
+	depends = nvidia-340xx-utils=340.76
 	conflicts = nvidia-rt
 	conflicts = nvidia-last-rt
+	conflicts = nvidia-rt-lts
 	options = !strip
+	source = http://us.download.nvidia.com/XFree86/Linux-/340.76/.run
+	source = nv-drm.patch
+	source = nvidia-4.0.patch
+	md5sums = SKIP
+	md5sums = 79671a27131da619a33eb02ed0c2c031
+	md5sums = f42bdf589f52d4e6c38baa5bef15eef8
 
 pkgname = nvidia-340xx-rt
 
diff --git a/PKGBUILD b/PKGBUILD
index 005f950445a6..1e5a39c3993b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: AudioLinux  <audiolinux AT fastmail DOT fm>
+# Maintainer: Sandor Nagy <sandor.nagy-at-kdemail-dot-net>
+# Contributor: AudioLinux  <audiolinux AT fastmail DOT fm>
 # Contributor:  Morgan Cox <morgancoxuk@gmail.com>
 # Contributor: Joakim Hernberg <jbh@alchemy.lu>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
@@ -6,46 +7,60 @@
 
 pkgname=nvidia-340xx-rt
 pkgver=340.76
-_extramodules=extramodules-3.18-rt
-_kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=4
-pkgdesc="NVIDIA 340xx drivers for linux-rt."
+_extramodules=extramodules-4.1-rt
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux-rt, 340xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-rt>=4.0' 'linux-rt<4.1' "nvidia-340xx-utils")
-makedepends=('linux-rt>=4.0' 'linux-rt<4.1')
-conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia-rt' 'nvidia-last-rt')
+depends=('linux-rt>=4.1' 'linux-rt<4.2' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-rt-headers>=4.1' 'linux-rt-headers<4.2')
+conflicts=('nvidia-rt' 'nvidia-last-rt' 'nvidia-rt-lts')
 license=('custom')
-install=nvidia.install
+install=${pkgname}.install
 options=(!strip)
 
 if [ "$CARCH" = "i686" ]; then
     _arch='x86'
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
-    source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=(SKIP )
 elif [ "$CARCH" = "x86_64" ]; then
-    _arch='x86_64'
+    _arch=$CARCH
     _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
-    source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-    md5sums=(SKIP )
 fi
+source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run"
+        nv-drm.patch
+        nvidia-4.0.patch)
 
-build() {
-    cd "${srcdir}"
+md5sums=(SKIP
+         '79671a27131da619a33eb02ed0c2c031'
+         'f42bdf589f52d4e6c38baa5bef15eef8')
+
+prepare() {
+    rm -Rf ${srcdir}/${_pkg}
     sh "${_pkg}.run" --extract-only
+
+    cd "${_pkg}"
+    patch -p0 -i ../nv-drm.patch
+    patch -p0 -i ../nvidia-4.0.patch
+}
+
+build() {
+    _kernver="$(cat /lib/modules/${_extramodules}/version)"
+
     cd "${_pkg}/kernel"
+    make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 
-    # Build module
-    msg2 "Starting make module..."
+    cd uvm
     make IGNORE_PREEMPT_RT_PRESENCE=1 SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
 package() {
     install -D -m644 "${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 "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
     install -d -m755 "${pkgdir}/etc/modprobe.d"
     echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist-nvidia-rt.conf"
-    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install"
+    install -D -m644 ${srcdir}/${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/nv-drm.patch b/nv-drm.patch
new file mode 100644
index 000000000000..4c6a393c43ce
--- /dev/null
+++ b/nv-drm.patch
@@ -0,0 +1,27 @@
+--- kernel/nv-drm.c~ 2014-09-12 00:33:06.000000000 +0200
++++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
+@@ -18,6 +18,11 @@
+
+ #include <drm/drmP.h>
+
++/* 3.18-rc0+ */
++#ifndef drm_gem_object
++#include <drm/drm_gem.h>
++#endif
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+diff --git a/kernel/nv-drm.c~ b/kernel/nv-drm.c
+index ecc982a..60d7aae 100644
+--- kernel/nv-drm.c~
++++ kernel/nv-drm.c
+@@ -129,6 +129,8 @@ static struct drm_driver nv_drm_driver = {
+     .gem_prime_vmap = nv_gem_prime_vmap,
+     .gem_prime_vunmap = nv_gem_prime_vunmap,
+
++    .set_busid = drm_pci_set_busid,
++
+     .name = "nvidia-drm",
+     .desc = "NVIDIA DRM driver",
+     .date = "20130102",
diff --git a/nvidia.install b/nvidia-340xx-rt.install
index dd197d6cdbe5..5aa011c0c559 100644
--- a/nvidia.install
+++ b/nvidia-340xx-rt.install
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.18-rt'
+    EXTRAMODULES='extramodules-4.1-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.18-rt'
+    EXTRAMODULES='extramodules-4.1-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
         echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@ post_upgrade() {
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.18-rt'
+    EXTRAMODULES='extramodules-4.1-rt'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/nvidia-4.0.patch b/nvidia-4.0.patch
new file mode 100644
index 000000000000..905ebeaf3fde
--- /dev/null
+++ b/nvidia-4.0.patch
@@ -0,0 +1,28 @@
+--- kernel/nv-pat.c~ 2015-02-22 20:39:43.889075396 -0800
++++ kernel/nv-pat.c 2015-02-22 20:29:33.519735577 -0800
+@@ -35,8 +35,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#else
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+ 
+@@ -46,7 +46,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++    if (cr4 & 0x80) __write_cr4(cr4);
++#else
+     if (cr4 & 0x80) write_cr4(cr4);
++#endif
+ }
+ 
+ static int nv_determine_pat_mode(void)