diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | linux-4.6.patch | 150 | ||||
| -rw-r--r-- | nvidia-340xx-ck.install | 2 |
4 files changed, 166 insertions, 11 deletions
@@ -1,19 +1,19 @@ # Generated by mksrcinfo v8 -# Thu May 5 00:03:57 UTC 2016 +# Sat Jun 25 15:28:52 UTC 2016 pkgbase = nvidia-340xx-ck pkgdesc = NVIDIA drivers for linux-ck, 340xx legacy branch. pkgver = 340.96 - pkgrel = 8 + pkgrel = 9 url = http://www.nvidia.com/ install = nvidia-340xx-ck.install arch = i686 arch = x86_64 license = custom - makedepends = linux-ck-headers>=4.5 - makedepends = linux-ck-headers<4.6 + makedepends = linux-ck-headers>=4.6 + makedepends = linux-ck-headers<4.7 makedepends = nvidia-340xx-libgl - depends = linux-ck>=4.5 - depends = linux-ck<4.6 + depends = linux-ck>=4.6 + depends = linux-ck<4.7 depends = libgl depends = nvidia-340xx-utils=340.96 conflicts = nvidia-ck @@ -69,6 +69,8 @@ pkgbase = nvidia-340xx-ck conflicts = nvidia-340xx-ck-pentm conflicts = nvidia-340xx-ck-sandybridge options = !strip + source = linux-4.6.patch + sha256sums = e813c31a9450200f533d12aa98dd5db44d7dc5b548697e9e9251198f917ffba5 source_i686 = ftp://download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run sha256sums_i686 = c40e2778cd1ab036a76e1896fe2f77c4aa7baa215dbbdb11a2f4c5f05e1a478e source_x86_64 = ftp://download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96-no-compat32.run @@ -3,21 +3,23 @@ pkgname=nvidia-340xx-ck pkgver=340.96 -_extramodules=extramodules-4.5-ck -pkgrel=8 +_extramodules=extramodules-4.6-ck +pkgrel=9 pkgdesc="NVIDIA drivers for linux-ck, 340xx legacy branch." arch=('i686' 'x86_64') url="http://www.nvidia.com/" -depends=('linux-ck>=4.5' 'linux-ck<4.6' 'libgl' "nvidia-340xx-utils=${pkgver}") -makedepends=('linux-ck-headers>=4.5' 'linux-ck-headers<4.6' 'nvidia-340xx-libgl') +depends=('linux-ck>=4.6' 'linux-ck<4.7' 'libgl' "nvidia-340xx-utils=${pkgver}") +makedepends=('linux-ck-headers>=4.6' 'linux-ck-headers<4.7' 'nvidia-340xx-libgl') conflicts=('nvidia-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-broadwell' 'nvidia-ck-skylake' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-broadwell' 'nvidia-304xx-ck-skylake' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-broadwell' 'nvidia-340xx-ck-skylake' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge') #groups=('ck-generic') #replaces=() license=('custom') install=nvidia-340xx-ck.install 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") +sha256sums=('e813c31a9450200f533d12aa98dd5db44d7dc5b548697e9e9251198f917ffba5') sha256sums_i686=('c40e2778cd1ab036a76e1896fe2f77c4aa7baa215dbbdb11a2f4c5f05e1a478e') sha256sums_x86_64=('280f9db2aea52cab42e141f0393604c7a6d43e7f65d3e60c2319c2674ecc14c4') @@ -27,6 +29,7 @@ sha256sums_x86_64=('280f9db2aea52cab42e141f0393604c7a6d43e7f65d3e60c2319c2674ecc prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" + patch -p1 --no-backup-if-mismatch -i ../linux-4.6.patch } build() { diff --git a/linux-4.6.patch b/linux-4.6.patch new file mode 100644 index 000000000000..0495ce1cdb3e --- /dev/null +++ b/linux-4.6.patch @@ -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; diff --git a/nvidia-340xx-ck.install b/nvidia-340xx-ck.install index f165fdfabad0..776582c768b6 100644 --- a/nvidia-340xx-ck.install +++ b/nvidia-340xx-ck.install @@ -1,5 +1,5 @@ post_upgrade() { - EXTRAMODULES='extramodules-4.5-ck' + EXTRAMODULES='extramodules-4.6-ck' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |