340.76

5 files changed, 153 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..9f5e6bf6275d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = nvidia-340xx-lqx
+	pkgdesc = NVIDIA drivers for linux-lqx, 340xx legacy branch
+	pkgver = 340.76
+	pkgrel = 7
+	url = http://www.nvidia.com/
+	install = nvidia-340xx-lqx.install
+	arch = i686
+	arch = x86_64
+	license = custom
+	depends = linux-lqx>=4.0
+	depends = linux-lqx<4.1
+	depends = nvidia-340xx-libgl
+	depends = nvidia-340xx-utils=340.76
+	conflicts = nvidia-lqx
+	conflicts = nvidia-304xx-lqx
+	options = !strip
+	source = nv-drm.patch
+	source = nvidia-4.0.patch
+	md5sums = 2365f1405f0c7bbb8f8cd7ebd5e4e301
+	md5sums = f42bdf589f52d4e6c38baa5bef15eef8
+	source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.76/NVIDIA-Linux-x86-340.76.run
+	md5sums_i686 = 8064c0a0998c3e7ee3c98ac1832b8194
+	source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.76/NVIDIA-Linux-x86_64-340.76-no-compat32.run
+	md5sums_x86_64 = 440df290e213280d6e20d4d4be6f8b4c
+
+pkgname = nvidia-340xx-lqx
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..0685ab452634
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com> PGP-Key: 78695CFD
+# Contributor: shivik <> PGP-Key: 761E423C
+# Contributor : Thomas Baechler <thomas@archlinux.org>
+
+pkgname=nvidia-340xx-lqx
+pkgver=340.76
+_extramodules=extramodules-4.0-lqx
+pkgrel=7
+pkgdesc="NVIDIA drivers for linux-lqx, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-lqx>=4.0' 'linux-lqx<4.1' "nvidia-340xx-libgl" "nvidia-340xx-utils=${pkgver}")
+#makedepends=('linux-headers>=4.0' 'linux-headers<4.1')
+conflicts=('nvidia-lqx' 'nvidia-304xx-lqx')
+license=('custom')
+install=${pkgname}.install
+options=(!strip)
+source=("nv-drm.patch"
+        "nvidia-4.0.patch")
+source_i686=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
+source_x86_64=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+md5sums=('2365f1405f0c7bbb8f8cd7ebd5e4e301'
+         'f42bdf589f52d4e6c38baa5bef15eef8')
+md5sums_i686=('8064c0a0998c3e7ee3c98ac1832b8194')
+md5sums_x86_64=('440df290e213280d6e20d4d4be6f8b4c')
+
+
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+    patch -Np0 -i "$srcdir/nv-drm.patch"
+    patch -Np0 -i "$srcdir/nvidia-4.0.patch"   
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}"/kernel
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+    cd uvm
+    make 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}/usr/lib/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-340xx-lqx.conf"
+}
diff --git a/nv-drm.patch b/nv-drm.patch
new file mode 100644
index 000000000000..820463d378c2
--- /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-340xx-lqx.install b/nvidia-340xx-lqx.install
new file mode 100644
index 000000000000..181d0bc51409
--- /dev/null
+++ b/nvidia-340xx-lqx.install
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.0-lqx'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-4.0-lqx'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-4.0-lqx'
+    depmod $(cat /usr/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)