Date: Friday, July 10, 2015 @ 20:20:06
Author: foutrelis
Revision: 242098
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nvidia-340xx/repos/staging-i686/
nvidia-340xx/repos/staging-i686/PKGBUILD
(from rev 242097, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/staging-i686/nv-drm.patch
(from rev 242097, nvidia-340xx/trunk/nv-drm.patch)
nvidia-340xx/repos/staging-i686/nvidia-340xx.install
(from rev 242097, nvidia-340xx/trunk/nvidia-340xx.install)
nvidia-340xx/repos/staging-i686/nvidia-4.0.patch
(from rev 242097, nvidia-340xx/trunk/nvidia-4.0.patch)
nvidia-340xx/repos/staging-x86_64/
nvidia-340xx/repos/staging-x86_64/PKGBUILD
(from rev 242097, nvidia-340xx/trunk/PKGBUILD)
nvidia-340xx/repos/staging-x86_64/nv-drm.patch
(from rev 242097, nvidia-340xx/trunk/nv-drm.patch)
nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install
(from rev 242097, nvidia-340xx/trunk/nvidia-340xx.install)
nvidia-340xx/repos/staging-x86_64/nvidia-4.0.patch
(from rev 242097, nvidia-340xx/trunk/nvidia-4.0.patch)
-------------------------------------+
staging-i686/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++
staging-i686/nv-drm.patch | 27 +++++++++++++++++
staging-i686/nvidia-340xx.install | 13 ++++++++
staging-i686/nvidia-4.0.patch | 28 +++++++++++++++++
staging-x86_64/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++
staging-x86_64/nv-drm.patch | 27 +++++++++++++++++
staging-x86_64/nvidia-340xx.install | 13 ++++++++
staging-x86_64/nvidia-4.0.patch | 28 +++++++++++++++++
8 files changed, 244 insertions(+)
Copied: nvidia-340xx/repos/staging-i686/PKGBUILD (from rev 242097,
nvidia-340xx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler <tho...@archlinux.org>
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.install
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";
+
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";
+ nv-drm.patch
+ nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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}"
+ # patches here
+ patch -p0 -i ../nv-drm.patch
+ patch -p0 -i ../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.conf"
+}
Copied: nvidia-340xx/repos/staging-i686/nv-drm.patch (from rev 242097,
nvidia-340xx/trunk/nv-drm.patch)
===================================================================
--- staging-i686/nv-drm.patch (rev 0)
+++ staging-i686/nv-drm.patch 2015-07-10 18:20:06 UTC (rev 242098)
@@ -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",
Copied: nvidia-340xx/repos/staging-i686/nvidia-340xx.install (from rev 242097,
nvidia-340xx/trunk/nvidia-340xx.install)
===================================================================
--- staging-i686/nvidia-340xx.install (rev 0)
+++ staging-i686/nvidia-340xx.install 2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.1-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nvidia-340xx/repos/staging-i686/nvidia-4.0.patch (from rev 242097,
nvidia-340xx/trunk/nvidia-4.0.patch)
===================================================================
--- staging-i686/nvidia-4.0.patch (rev 0)
+++ staging-i686/nvidia-4.0.patch 2015-07-10 18:20:06 UTC (rev 242098)
@@ -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)
Copied: nvidia-340xx/repos/staging-x86_64/PKGBUILD (from rev 242097,
nvidia-340xx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# Maintainer : Thomas Baechler <tho...@archlinux.org>
+
+pkgname=nvidia-340xx
+pkgver=340.76
+_extramodules=extramodules-4.1-ARCH
+pkgrel=12
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/";
+depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-340xx-utils=${pkgver}")
+makedepends=('linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+install=${pkgname}.install
+options=(!strip)
+source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";
+
"ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";
+ nv-drm.patch
+ nvidia-4.0.patch)
+md5sums=('8064c0a0998c3e7ee3c98ac1832b8194'
+ '440df290e213280d6e20d4d4be6f8b4c'
+ '79671a27131da619a33eb02ed0c2c031'
+ 'f42bdf589f52d4e6c38baa5bef15eef8')
+
+[[ "$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}"
+ # patches here
+ patch -p0 -i ../nv-drm.patch
+ patch -p0 -i ../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.conf"
+}
Copied: nvidia-340xx/repos/staging-x86_64/nv-drm.patch (from rev 242097,
nvidia-340xx/trunk/nv-drm.patch)
===================================================================
--- staging-x86_64/nv-drm.patch (rev 0)
+++ staging-x86_64/nv-drm.patch 2015-07-10 18:20:06 UTC (rev 242098)
@@ -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",
Copied: nvidia-340xx/repos/staging-x86_64/nvidia-340xx.install (from rev
242097, nvidia-340xx/trunk/nvidia-340xx.install)
===================================================================
--- staging-x86_64/nvidia-340xx.install (rev 0)
+++ staging-x86_64/nvidia-340xx.install 2015-07-10 18:20:06 UTC (rev 242098)
@@ -0,0 +1,13 @@
+post_install() {
+ EXTRAMODULES='extramodules-4.1-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nvidia-340xx/repos/staging-x86_64/nvidia-4.0.patch (from rev 242097,
nvidia-340xx/trunk/nvidia-4.0.patch)
===================================================================
--- staging-x86_64/nvidia-4.0.patch (rev 0)
+++ staging-x86_64/nvidia-4.0.patch 2015-07-10 18:20:06 UTC (rev 242098)
@@ -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)
