[arch-commits] Commit in nvidia-340xx/repos (12 files)

Tobias Powalowski tpowa at archlinux.org
Thu Aug 25 20:14:39 UTC 2016


    Date: Thursday, August 25, 2016 @ 20:14:39
  Author: tpowa
Revision: 274648

db-move: moved nvidia-340xx from [testing] to [extra] (i686, x86_64)

Added:
  nvidia-340xx/repos/extra-i686/PKGBUILD
    (from rev 274647, nvidia-340xx/repos/testing-i686/PKGBUILD)
  nvidia-340xx/repos/extra-i686/linux-4.6.patch
    (from rev 274647, nvidia-340xx/repos/testing-i686/linux-4.6.patch)
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
    (from rev 274647, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
    (from rev 274647, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
  nvidia-340xx/repos/extra-x86_64/linux-4.6.patch
    (from rev 274647, nvidia-340xx/repos/testing-x86_64/linux-4.6.patch)
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
    (from rev 274647, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
Deleted:
  nvidia-340xx/repos/extra-i686/PKGBUILD
  nvidia-340xx/repos/extra-i686/nvidia-340xx.install
  nvidia-340xx/repos/extra-x86_64/PKGBUILD
  nvidia-340xx/repos/extra-x86_64/nvidia-340xx.install
  nvidia-340xx/repos/testing-i686/
  nvidia-340xx/repos/testing-x86_64/

-----------------------------------+
 /PKGBUILD                         |  142 ++++++++++++++++++++++++++++++++++
 /nvidia-340xx.install             |   26 ++++++
 extra-i686/PKGBUILD               |   71 -----------------
 extra-i686/linux-4.6.patch        |  150 ++++++++++++++++++++++++++++++++++++
 extra-i686/nvidia-340xx.install   |   13 ---
 extra-x86_64/PKGBUILD             |   71 -----------------
 extra-x86_64/linux-4.6.patch      |  150 ++++++++++++++++++++++++++++++++++++
 extra-x86_64/nvidia-340xx.install |   13 ---
 8 files changed, 468 insertions(+), 168 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-08-25 20:14:37 UTC (rev 274647)
+++ extra-i686/PKGBUILD	2016-08-25 20:14:39 UTC (rev 274648)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.7-ARCH
-pkgrel=14
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source=('linux-4.6.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=('1f2baa65fd351ae7a2fc3dfd71ffcbfe')
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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 -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
-
-    cp -a kernel kernel-dkms
-}
-
-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_nvidia-340xx() {
-    pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-    depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
-    conflict+=('nvidia-340xx-dkms')
-    install=nvidia-340xx.install
-
-    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"
-}
-
-package_nvidia-340xx-dkms() {
-    pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-    depends=('dkms' "nvidia-340xx-utils=$pkgver")
-    optdepends=('linux-headers: Build the module for Arch kernel'
-                'linux-lts-headers: Build the module for LTS Arch kernel')
-    conflicts+=('nvidia-340xx')
-
-    cd ${_pkg}
-    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}"/usr/src/nvidia-${pkgver}
-    echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-    cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-i686/PKGBUILD (from rev 274647, nvidia-340xx/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.7-ARCH
+pkgrel=15
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=('linux-4.6.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=('1f2baa65fd351ae7a2fc3dfd71ffcbfe')
+md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
+md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
+
+[[ "$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 -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
+
+    cp -a kernel kernel-dkms
+}
+
+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_nvidia-340xx() {
+    pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+    depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
+    conflict+=('nvidia-340xx-dkms')
+    install=nvidia-340xx.install
+
+    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"
+}
+
+package_nvidia-340xx-dkms() {
+    pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+    depends=('dkms' "nvidia-340xx-utils=$pkgver")
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflicts+=('nvidia-340xx')
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}"/usr/src/nvidia-${pkgver}
+    echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+    cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+}

Copied: nvidia-340xx/repos/extra-i686/linux-4.6.patch (from rev 274647, nvidia-340xx/repos/testing-i686/linux-4.6.patch)
===================================================================
--- extra-i686/linux-4.6.patch	                        (rev 0)
+++ extra-i686/linux-4.6.patch	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,150 @@
+--- /dev/null
++++ b/kernel/nv-mm.h
+@@ -0,0 +1,55 @@
++/*******************************************************************************
++    Copyright (c) 2016 NVIDIA Corporation
++
++    Permission is hereby granted, free of charge, to any person obtaining a copy
++    of this software and associated documentation files (the "Software"), to
++    deal in the Software without restriction, including without limitation the
++    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++    sell copies of the Software, and to permit persons to whom the Software is
++    furnished to do so, subject to the following conditions:
++
++        The above copyright notice and this permission notice shall be
++        included in all copies or substantial portions of the Software.
++
++    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++    DEALINGS IN THE SOFTWARE.
++
++*******************************************************************************/
++#ifndef __NV_MM_H__
++#define __NV_MM_H__
++
++/*  get_user_pages_remote() was added by:
++ *    2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ *
++ *  The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
++ *  deprecated the 8-argument version of get_user_pages for the
++ *  non-remote case (calling get_user_pages with current and current->mm).
++ *
++ *  The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
++ *  version that uses something other than current and current->mm. Use
++ *  NV_GET_USER_PAGES if you are refering to current and current->mm.
++ *
++*  Note that get_user_pages_remote() requires the caller to hold a reference on
++*  the task_struct (if non-NULL) and the mm_struct. This will always be true
++*  when using current and current->mm. If the kernel passes the driver a vma
++*  via driver callback, the kernel holds a reference on vma->vm_mm over that
++*  callback.
++ */
++
++#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
++    #define NV_GET_USER_PAGES           get_user_pages
++    #define NV_GET_USER_PAGES_REMOTE    get_user_pages_remote
++#else
++    #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
++        get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
++
++    #define NV_GET_USER_PAGES_REMOTE    get_user_pages
++#endif
++
++
++#endif // __NV_MM_H__
+--- a/kernel/os-mlock.c
++++ b/kernel/os-mlock.c
+@@ -13,6 +13,7 @@
+ 
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include "nv-mm.h"
+ 
+ RM_STATUS NV_API_CALL os_lock_user_pages(
+     void   *address,
+@@ -45,7 +46,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     }
+ 
+     down_read(&mm->mmap_sem);
+-    ret = get_user_pages(current, mm, (unsigned long)address,
++    ret = NV_GET_USER_PAGES((unsigned long)address,
+             page_count, write, force, user_pages, NULL);
+     up_read(&mm->mmap_sem);
+     pinned = ret;
+@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     else if (pinned < page_count)
+     {
+         for (i = 0; i < pinned; i++)
+-            page_cache_release(user_pages[i]);
++            put_page(user_pages[i]);
+         os_free_mem(user_pages);
+         return RM_ERR_INVALID_ADDRESS;
+     }
+@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
+     {
+         if (write)
+             set_page_dirty_lock(user_pages[i]);
+-        page_cache_release(user_pages[i]);
++        put_page(user_pages[i]);
+     }
+ 
+     os_free_mem(user_pages);
+diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
+index d01488b..308ea8a 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1669,6 +1669,23 @@ compile_test() {
+ 
+             compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
+         ;;
++
++        get_user_pages_remote)
++            #
++            # Determine if the function get_user_pages_remote() is
++            # present.
++            #
++            # get_user_pages_remote() was added by:
++            #   2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++            #
++            CODE="
++            #include <linux/mm.h>
++            int conftest_get_user_pages_remote(void) {
++                get_user_pages_remote();
++            }"
++
++            compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
++        ;;
+     esac
+ }
+ 
+diff --git a/kernel/Makefile.orig b/kernel/Makefile
+index 438d487..c52a36c 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -139,7 +139,8 @@ COMPILE_TESTS = \
+ 	drm_pci_set_busid \
+ 	write_cr4 \
+ 	for_each_online_node \
+-	node_end_pfn
++	node_end_pfn \
++	get_user_pages_remote
+ 
+ #
+ # CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
+diff --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
+index 442a0a8..695f092 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
+         // a reference so that the fault handling logic is correct:
+         //
+         get_page(pTracking->uvmPage);
+-        retValue = VM_FAULT_MINOR;
++        retValue = 0;
+     }
+ 
+     pRecord->isMapped = NV_TRUE;

Deleted: extra-i686/nvidia-340xx.install
===================================================================
--- extra-i686/nvidia-340xx.install	2016-08-25 20:14:37 UTC (rev 274647)
+++ extra-i686/nvidia-340xx.install	2016-08-25 20:14:39 UTC (rev 274648)
@@ -1,13 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.7-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/extra-i686/nvidia-340xx.install (from rev 274647, nvidia-340xx/repos/testing-i686/nvidia-340xx.install)
===================================================================
--- extra-i686/nvidia-340xx.install	                        (rev 0)
+++ extra-i686/nvidia-340xx.install	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,13 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.7-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
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-08-25 20:14:37 UTC (rev 274647)
+++ extra-x86_64/PKGBUILD	2016-08-25 20:14:39 UTC (rev 274648)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgbase=nvidia-340xx
-pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.96
-_extramodules=extramodules-4.7-ARCH
-pkgrel=14
-arch=('i686' 'x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
-conflicts=('nvidia')
-license=('custom')
-options=(!strip)
-source=('linux-4.6.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=('1f2baa65fd351ae7a2fc3dfd71ffcbfe')
-md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
-md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
-
-[[ "$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 -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
-
-    cp -a kernel kernel-dkms
-}
-
-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_nvidia-340xx() {
-    pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-    depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
-    conflict+=('nvidia-340xx-dkms')
-    install=nvidia-340xx.install
-
-    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"
-}
-
-package_nvidia-340xx-dkms() {
-    pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
-    depends=('dkms' "nvidia-340xx-utils=$pkgver")
-    optdepends=('linux-headers: Build the module for Arch kernel'
-                'linux-lts-headers: Build the module for LTS Arch kernel')
-    conflicts+=('nvidia-340xx')
-
-    cd ${_pkg}
-    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
-    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}"/usr/src/nvidia-${pkgver}
-    echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
-    cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
-}

Copied: nvidia-340xx/repos/extra-x86_64/PKGBUILD (from rev 274647, nvidia-340xx/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.96
+_extramodules=extramodules-4.7-ARCH
+pkgrel=15
+arch=('i686' 'x86_64')
+url="http://www.nvidia.com/"
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
+conflicts=('nvidia')
+license=('custom')
+options=(!strip)
+source=('linux-4.6.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=('1f2baa65fd351ae7a2fc3dfd71ffcbfe')
+md5sums_i686=('cb64b165b638671bcdc75bcf297b8d90')
+md5sums_x86_64=('7bdbcee13bade63227933d9217571882')
+
+[[ "$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 -p1 --no-backup-if-mismatch -i ../linux-4.6.patch
+
+    cp -a kernel kernel-dkms
+}
+
+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_nvidia-340xx() {
+    pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+    depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
+    conflict+=('nvidia-340xx-dkms')
+    install=nvidia-340xx.install
+
+    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"
+}
+
+package_nvidia-340xx-dkms() {
+    pkgdesc="NVIDIA driver sources for linux, 340xx legacy branch"
+    depends=('dkms' "nvidia-340xx-utils=$pkgver")
+    optdepends=('linux-headers: Build the module for Arch kernel'
+                'linux-lts-headers: Build the module for LTS Arch kernel')
+    conflicts+=('nvidia-340xx')
+
+    cd ${_pkg}
+    install -dm 755 "${pkgdir}"/usr/{lib/modprobe.d,src}
+    cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}"/usr/src/nvidia-${pkgver}
+    echo 'blacklist nouveau' > "${pkgdir}"/usr/lib/modprobe.d/nvidia.conf
+    cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >> "${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+}

Copied: nvidia-340xx/repos/extra-x86_64/linux-4.6.patch (from rev 274647, nvidia-340xx/repos/testing-x86_64/linux-4.6.patch)
===================================================================
--- extra-x86_64/linux-4.6.patch	                        (rev 0)
+++ extra-x86_64/linux-4.6.patch	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,150 @@
+--- /dev/null
++++ b/kernel/nv-mm.h
+@@ -0,0 +1,55 @@
++/*******************************************************************************
++    Copyright (c) 2016 NVIDIA Corporation
++
++    Permission is hereby granted, free of charge, to any person obtaining a copy
++    of this software and associated documentation files (the "Software"), to
++    deal in the Software without restriction, including without limitation the
++    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++    sell copies of the Software, and to permit persons to whom the Software is
++    furnished to do so, subject to the following conditions:
++
++        The above copyright notice and this permission notice shall be
++        included in all copies or substantial portions of the Software.
++
++    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++    DEALINGS IN THE SOFTWARE.
++
++*******************************************************************************/
++#ifndef __NV_MM_H__
++#define __NV_MM_H__
++
++/*  get_user_pages_remote() was added by:
++ *    2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++ *
++ *  The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
++ *  deprecated the 8-argument version of get_user_pages for the
++ *  non-remote case (calling get_user_pages with current and current->mm).
++ *
++ *  The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
++ *  version that uses something other than current and current->mm. Use
++ *  NV_GET_USER_PAGES if you are refering to current and current->mm.
++ *
++*  Note that get_user_pages_remote() requires the caller to hold a reference on
++*  the task_struct (if non-NULL) and the mm_struct. This will always be true
++*  when using current and current->mm. If the kernel passes the driver a vma
++*  via driver callback, the kernel holds a reference on vma->vm_mm over that
++*  callback.
++ */
++
++#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
++    #define NV_GET_USER_PAGES           get_user_pages
++    #define NV_GET_USER_PAGES_REMOTE    get_user_pages_remote
++#else
++    #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
++        get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
++
++    #define NV_GET_USER_PAGES_REMOTE    get_user_pages
++#endif
++
++
++#endif // __NV_MM_H__
+--- a/kernel/os-mlock.c
++++ b/kernel/os-mlock.c
+@@ -13,6 +13,7 @@
+ 
+ #include "os-interface.h"
+ #include "nv-linux.h"
++#include "nv-mm.h"
+ 
+ RM_STATUS NV_API_CALL os_lock_user_pages(
+     void   *address,
+@@ -45,7 +46,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     }
+ 
+     down_read(&mm->mmap_sem);
+-    ret = get_user_pages(current, mm, (unsigned long)address,
++    ret = NV_GET_USER_PAGES((unsigned long)address,
+             page_count, write, force, user_pages, NULL);
+     up_read(&mm->mmap_sem);
+     pinned = ret;
+@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
+     else if (pinned < page_count)
+     {
+         for (i = 0; i < pinned; i++)
+-            page_cache_release(user_pages[i]);
++            put_page(user_pages[i]);
+         os_free_mem(user_pages);
+         return RM_ERR_INVALID_ADDRESS;
+     }
+@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
+     {
+         if (write)
+             set_page_dirty_lock(user_pages[i]);
+-        page_cache_release(user_pages[i]);
++        put_page(user_pages[i]);
+     }
+ 
+     os_free_mem(user_pages);
+diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
+index d01488b..308ea8a 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1669,6 +1669,23 @@ compile_test() {
+ 
+             compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
+         ;;
++
++        get_user_pages_remote)
++            #
++            # Determine if the function get_user_pages_remote() is
++            # present.
++            #
++            # get_user_pages_remote() was added by:
++            #   2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
++            #
++            CODE="
++            #include <linux/mm.h>
++            int conftest_get_user_pages_remote(void) {
++                get_user_pages_remote();
++            }"
++
++            compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
++        ;;
+     esac
+ }
+ 
+diff --git a/kernel/Makefile.orig b/kernel/Makefile
+index 438d487..c52a36c 100644
+--- a/kernel/Makefile
++++ b/kernel/Makefile
+@@ -139,7 +139,8 @@ COMPILE_TESTS = \
+ 	drm_pci_set_busid \
+ 	write_cr4 \
+ 	for_each_online_node \
+-	node_end_pfn
++	node_end_pfn \
++	get_user_pages_remote
+ 
+ #
+ # CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
+diff --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
+index 442a0a8..695f092 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
+         // a reference so that the fault handling logic is correct:
+         //
+         get_page(pTracking->uvmPage);
+-        retValue = VM_FAULT_MINOR;
++        retValue = 0;
+     }
+ 
+     pRecord->isMapped = NV_TRUE;

Deleted: extra-x86_64/nvidia-340xx.install
===================================================================
--- extra-x86_64/nvidia-340xx.install	2016-08-25 20:14:37 UTC (rev 274647)
+++ extra-x86_64/nvidia-340xx.install	2016-08-25 20:14:39 UTC (rev 274648)
@@ -1,13 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.7-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/extra-x86_64/nvidia-340xx.install (from rev 274647, nvidia-340xx/repos/testing-x86_64/nvidia-340xx.install)
===================================================================
--- extra-x86_64/nvidia-340xx.install	                        (rev 0)
+++ extra-x86_64/nvidia-340xx.install	2016-08-25 20:14:39 UTC (rev 274648)
@@ -0,0 +1,13 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.7-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
+}



More information about the arch-commits mailing list