[arch-commits] Commit in nvidia-304xx/repos (14 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Aug 3 22:13:42 UTC 2015
Date: Tuesday, August 4, 2015 @ 00:13:41
Author: foutrelis
Revision: 242982
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
nvidia-304xx/repos/staging-i686/
nvidia-304xx/repos/staging-i686/PKGBUILD
(from rev 242981, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/staging-i686/nv-drm.patch
(from rev 242981, nvidia-304xx/trunk/nv-drm.patch)
nvidia-304xx/repos/staging-i686/nvidia-3.19.patch
(from rev 242981, nvidia-304xx/trunk/nvidia-3.19.patch)
nvidia-304xx/repos/staging-i686/nvidia-304xx-dkms.install
(from rev 242981, nvidia-304xx/trunk/nvidia-304xx-dkms.install)
nvidia-304xx/repos/staging-i686/nvidia-304xx.install
(from rev 242981, nvidia-304xx/trunk/nvidia-304xx.install)
nvidia-304xx/repos/staging-i686/nvidia-4.0.patch
(from rev 242981, nvidia-304xx/trunk/nvidia-4.0.patch)
nvidia-304xx/repos/staging-x86_64/
nvidia-304xx/repos/staging-x86_64/PKGBUILD
(from rev 242981, nvidia-304xx/trunk/PKGBUILD)
nvidia-304xx/repos/staging-x86_64/nv-drm.patch
(from rev 242981, nvidia-304xx/trunk/nv-drm.patch)
nvidia-304xx/repos/staging-x86_64/nvidia-3.19.patch
(from rev 242981, nvidia-304xx/trunk/nvidia-3.19.patch)
nvidia-304xx/repos/staging-x86_64/nvidia-304xx-dkms.install
(from rev 242981, nvidia-304xx/trunk/nvidia-304xx-dkms.install)
nvidia-304xx/repos/staging-x86_64/nvidia-304xx.install
(from rev 242981, nvidia-304xx/trunk/nvidia-304xx.install)
nvidia-304xx/repos/staging-x86_64/nvidia-4.0.patch
(from rev 242981, nvidia-304xx/trunk/nvidia-4.0.patch)
------------------------------------------+
staging-i686/PKGBUILD | 75 +++++++++++++++++++++++++++++
staging-i686/nv-drm.patch | 27 ++++++++++
staging-i686/nvidia-3.19.patch | 21 ++++++++
staging-i686/nvidia-304xx-dkms.install | 30 +++++++++++
staging-i686/nvidia-304xx.install | 13 +++++
staging-i686/nvidia-4.0.patch | 28 ++++++++++
staging-x86_64/PKGBUILD | 75 +++++++++++++++++++++++++++++
staging-x86_64/nv-drm.patch | 27 ++++++++++
staging-x86_64/nvidia-3.19.patch | 21 ++++++++
staging-x86_64/nvidia-304xx-dkms.install | 30 +++++++++++
staging-x86_64/nvidia-304xx.install | 13 +++++
staging-x86_64/nvidia-4.0.patch | 28 ++++++++++
12 files changed, 388 insertions(+)
Copied: nvidia-304xx/repos/staging-i686/PKGBUILD (from rev 242981, nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-304xx
+pkgname=(nvidia-304xx nvidia-304xx-dkms)
+pkgver=304.125
+_extramodules=extramodules-4.1-ARCH
+pkgrel=22
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 'nv-drm.patch'
+ 'nvidia-3.19.patch'
+ 'nvidia-4.0.patch')
+sha512sums=('cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7'
+ '3b50d1353ff6cfee9042455b78e889c198e40dfe832dde79eda1a47d9f1f02b29f0161f1ac694dc7502eb2a94bad6b98244568cc353f387b02de6cae1c17d4ae'
+ 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f'
+ 'f52a9f82a73eef9e27046c51ce0b2671ee2893f9b12e17c722f17416c39ac0b8d7d5b1fed51b6ab6f36670b036cd96d5cfeae37300ef041c029fd3d3d136ff3d'
+ 'd00a2a4c5bf38041cf9e4f61aa0ad0d6123451839eb272c36d7e466d77b33d90415cfa6f96a3a9da8688a1048e93a03169f808e6b2ddc2d9d148bab8485dae27')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p0 -i "$srcdir/nv-drm.patch"
+ patch -p1 -i "$srcdir/nvidia-3.19.patch"
+ patch -p0 -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
+}
+
+package_nvidia-304xx() {
+ pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
+ depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-304xx-utils=${pkgver}")
+ conflicts+=('nvidia-304xx-dkms')
+ install=nvidia-304xx.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time.
+}
+
+package_nvidia-304xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch"
+ depends=('dkms' "nvidia-304xx-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia-304xx')
+ install=nvidia-304xx-dkms.install
+
+ cd ${_pkg}
+ make -C kernel clean
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver}
+ echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+}
Copied: nvidia-304xx/repos/staging-i686/nv-drm.patch (from rev 242981, nvidia-304xx/trunk/nv-drm.patch)
===================================================================
--- staging-i686/nv-drm.patch (rev 0)
+++ staging-i686/nv-drm.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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-304xx/repos/staging-i686/nvidia-3.19.patch (from rev 242981, nvidia-304xx/trunk/nvidia-3.19.patch)
===================================================================
--- staging-i686/nvidia-3.19.patch (rev 0)
+++ staging-i686/nvidia-3.19.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,21 @@
+diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c
+--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100
++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100
+@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
+ unsigned long i_arg
+ )
+ {
+- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+
+ long nv_kern_compat_ioctl(
+@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
+ unsigned long i_arg
+ )
+ {
+- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+
+ /*
Copied: nvidia-304xx/repos/staging-i686/nvidia-304xx-dkms.install (from rev 242981, nvidia-304xx/trunk/nvidia-304xx-dkms.install)
===================================================================
--- staging-i686/nvidia-304xx-dkms.install (rev 0)
+++ staging-i686/nvidia-304xx-dkms.install 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: nvidia-304xx/repos/staging-i686/nvidia-304xx.install (from rev 242981, nvidia-304xx/trunk/nvidia-304xx.install)
===================================================================
--- staging-i686/nvidia-304xx.install (rev 0)
+++ staging-i686/nvidia-304xx.install 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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-304xx/repos/staging-i686/nvidia-4.0.patch (from rev 242981, nvidia-304xx/trunk/nvidia-4.0.patch)
===================================================================
--- staging-i686/nvidia-4.0.patch (rev 0)
+++ staging-i686/nvidia-4.0.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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-304xx/repos/staging-x86_64/PKGBUILD (from rev 242981, nvidia-304xx/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-304xx
+pkgname=(nvidia-304xx nvidia-304xx-dkms)
+pkgver=304.125
+_extramodules=extramodules-4.1-ARCH
+pkgrel=22
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=('libgl' "nvidia-304xx-utils=${pkgver}" 'linux' 'linux-headers>=4.1' 'linux-headers<4.2')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+ "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+ 'nv-drm.patch'
+ 'nvidia-3.19.patch'
+ 'nvidia-4.0.patch')
+sha512sums=('cd77736790876b66c1e88bf30b7a93f755c0f94118edda8fde1701dc07dc4eb60f89a27b0ed432db74729f269cb239f32f3c5e045d701f60baf69da7fc0d0ea7'
+ '3b50d1353ff6cfee9042455b78e889c198e40dfe832dde79eda1a47d9f1f02b29f0161f1ac694dc7502eb2a94bad6b98244568cc353f387b02de6cae1c17d4ae'
+ 'aaa36ef7179acdc86850381de145a3aebab22273cd3c702a9d1343dc3415192c74a35da692312555f36193c5d46a1771ce07ea9508113cb9d0698873064aa19f'
+ 'f52a9f82a73eef9e27046c51ce0b2671ee2893f9b12e17c722f17416c39ac0b8d7d5b1fed51b6ab6f36670b036cd96d5cfeae37300ef041c029fd3d3d136ff3d'
+ 'd00a2a4c5bf38041cf9e4f61aa0ad0d6123451839eb272c36d7e466d77b33d90415cfa6f96a3a9da8688a1048e93a03169f808e6b2ddc2d9d148bab8485dae27')
+
+[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
+[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+
+prepare() {
+ cd "${srcdir}"
+ sh "${_pkg}.run" --extract-only
+ cd "${_pkg}"
+ # patches here
+ patch -p0 -i "$srcdir/nv-drm.patch"
+ patch -p1 -i "$srcdir/nvidia-3.19.patch"
+ patch -p0 -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
+}
+
+package_nvidia-304xx() {
+ pkgdesc="NVIDIA drivers for linux, 304xx legacy branch"
+ depends=('linux>=4.1' 'linux<4.2' 'libgl' "nvidia-304xx-utils=${pkgver}")
+ conflicts+=('nvidia-304xx-dkms')
+ install=nvidia-304xx.install
+
+ install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
+ "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+ install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
+ echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/${pkgname}.install"
+ gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+
+ # the license file is part of nvidia-304xx-utils - the module depends on it, so we don't ship it another time.
+}
+
+package_nvidia-304xx-dkms() {
+ pkgdesc="NVIDIA driver sources for linux, 304xx legacy branch"
+ depends=('dkms' "nvidia-304xx-utils=$pkgver")
+ optdepends=('linux-headers: Build the module for Arch kernel'
+ 'linux-lts-headers: Build the module for LTS Arch kernel')
+ conflicts+=('nvidia-304xx')
+ install=nvidia-304xx-dkms.install
+
+ cd ${_pkg}
+ make -C kernel clean
+ install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+ cp -dr --no-preserve='ownership' kernel "${pkgdir}"/usr/src/nvidia-${pkgver}
+ echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+}
Copied: nvidia-304xx/repos/staging-x86_64/nv-drm.patch (from rev 242981, nvidia-304xx/trunk/nv-drm.patch)
===================================================================
--- staging-x86_64/nv-drm.patch (rev 0)
+++ staging-x86_64/nv-drm.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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-304xx/repos/staging-x86_64/nvidia-3.19.patch (from rev 242981, nvidia-304xx/trunk/nvidia-3.19.patch)
===================================================================
--- staging-x86_64/nvidia-3.19.patch (rev 0)
+++ staging-x86_64/nvidia-3.19.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,21 @@
+diff -Npur NVIDIA-Linux-x86_64-304.orig/kernel/nv.c NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c
+--- NVIDIA-Linux-x86_64-304.orig/kernel/nv.c 2014-12-02 04:58:34.000000000 +0100
++++ NVIDIA-Linux-x86_64-304.125-no-compat32/kernel/nv.c 2014-12-21 17:50:33.420697348 +0100
+@@ -2026,7 +2026,7 @@ long nv_kern_unlocked_ioctl(
+ unsigned long i_arg
+ )
+ {
+- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+
+ long nv_kern_compat_ioctl(
+@@ -2035,7 +2035,7 @@ long nv_kern_compat_ioctl(
+ unsigned long i_arg
+ )
+ {
+- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
+ }
+
+ /*
Copied: nvidia-304xx/repos/staging-x86_64/nvidia-304xx-dkms.install (from rev 242981, nvidia-304xx/trunk/nvidia-304xx-dkms.install)
===================================================================
--- staging-x86_64/nvidia-304xx-dkms.install (rev 0)
+++ staging-x86_64/nvidia-304xx-dkms.install 2015-08-03 22:13:41 UTC (rev 242982)
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add nvidia/${1%-*}
+ cat << EOF
+==> To build and install your modules run: dkms install nvidia/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove nvidia/${1%-*} --all &>/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Copied: nvidia-304xx/repos/staging-x86_64/nvidia-304xx.install (from rev 242981, nvidia-304xx/trunk/nvidia-304xx.install)
===================================================================
--- staging-x86_64/nvidia-304xx.install (rev 0)
+++ staging-x86_64/nvidia-304xx.install 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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-304xx/repos/staging-x86_64/nvidia-4.0.patch (from rev 242981, nvidia-304xx/trunk/nvidia-4.0.patch)
===================================================================
--- staging-x86_64/nvidia-4.0.patch (rev 0)
+++ staging-x86_64/nvidia-4.0.patch 2015-08-03 22:13:41 UTC (rev 242982)
@@ -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)
More information about the arch-commits
mailing list