[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Saturday, November 18, 2017 @ 23:55:38
Author: heftig
Revision: 310411
340.104-5
Added:
nvidia-340xx/trunk/kernel-4.14.patch
Modified:
nvidia-340xx/trunk/PKGBUILD
Deleted:
nvidia-340xx/trunk/nvidia-340xx.install
--+
PKGBUILD | 53 -
kernel-4.14.patch| 29 ++
nvidia-340xx.install | 13
3 files changed, 56 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-11-18 23:36:29 UTC (rev 310410)
+++ PKGBUILD2017-11-18 23:55:38 UTC (rev 310411)
@@ -5,23 +5,22 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.104
-_extramodules=extramodules-4.13-ARCH
-pkgrel=4
+_extramodules=extramodules-4.14-ARCH
+pkgrel=5
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
arch=('x86_64')
url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.13'
'linux-headers<4.14')
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.14'
'linux-headers<4.15')
conflicts=('nvidia')
license=('custom')
-options=(!strip)
-source=('kernel-4.11.patch')
-source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
-source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
-sha512sums=('c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2')
-sha512sums_i686=('8dacd5345a5794e862f4106ab9e8e402defa7883dd176c243d019209b560fe955d7576a13936364c01c5a249f15df58208308c9378c12c3438784376e5fb806c')
-sha512sums_x86_64=('e962494561728af5a911354bfb3560e414464f7858f30f9654eac5ca56175bc8498d1eee93a18248c63e9eee7d84807ef924fe9f53239644d7085b0f3502bf8c')
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";
+'kernel-4.11.patch' 'kernel-4.14.patch')
+sha512sums=('e962494561728af5a911354bfb3560e414464f7858f30f9654eac5ca56175bc8498d1eee93a18248c63e9eee7d84807ef924fe9f53239644d7085b0f3502bf8c'
+
'c25d90499e1deb26129a67dd7e953be8c1e31c5770e2b8b64d03af54cf1afec1a52636e74900f8ac468692207ab8a3765a12edd581142c4d2cfd2d6e66ac7ac2'
+
'ccaa40e085d985ec4280003e36dd06e60958ed1408867379fd21a68a18d48aa4be311bf9ad1e804f7a7245c90be98e919d2ec30f45d290f1cdb19c866bdb8a8d')
-[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
-[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
prepare() {
sh "${_pkg}.run" --extract-only
@@ -29,6 +28,7 @@
# patches here
patch -Np0 < "${srcdir}/kernel-4.11.patch"
+patch -Np1 < "${srcdir}/kernel-4.14.patch"
cp -a kernel kernel-dkms
}
@@ -44,29 +44,30 @@
package_nvidia-340xx() {
pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.13' 'linux<4.14' 'libgl' "nvidia-340xx-utils=${pkgver}")
-conflict+=('nvidia-340xx-dkms')
-install=nvidia-340xx.install
+depends=('linux>=4.14' 'linux<4.15' "nvidia-340xx-utils=${pkgver}" 'libgl')
-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"
+install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+ "${srcdir}/${_pkg}/kernel"/{nvidia,uvm/nvidia-uvm}.ko
+
+find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+
+echo "blacklist nouveau" |
+ install -Dm644 /dev/stdin "${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")
+depends=('dkms' "nvidia-340xx-utils=$pkgver" 'libgl')
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
+
+install -dm 755 "${pkgdir}"/usr/src
+cp -dr --no-preserve='ownership' kernel-dkms
"${pkgdir}/usr/src/nvidia-${pkgver}"
cat "${pkgdir}"/usr/src/nvidia-${pkgver}/uvm/dkms.conf.fragment >>
"${pkgdir}"/usr/src/nvidia-${pkgver}/dkms.conf
+
+echo "blacklist nouveau" |
+
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Thursday, July 13, 2017 @ 12:54:25
Author: heftig
Revision: 300246
340.102-10: kernel 4.12.1
Added:
nvidia-340xx/trunk/4.12.0_kernel.patch
Modified:
nvidia-340xx/trunk/PKGBUILD
nvidia-340xx/trunk/nvidia-340xx.install
--+
4.12.0_kernel.patch | 98 +
PKGBUILD | 14 ---
nvidia-340xx.install |2 -
3 files changed, 107 insertions(+), 7 deletions(-)
Added: 4.12.0_kernel.patch
===
--- 4.12.0_kernel.patch (rev 0)
+++ 4.12.0_kernel.patch 2017-07-13 12:54:25 UTC (rev 300246)
@@ -0,0 +1,98 @@
+diff -Naur NVIDIA-Linux-x86_64-340.102-old/kernel/conftest.sh
NVIDIA-Linux-x86_64-340.102-new/kernel/conftest.sh
+--- NVIDIA-Linux-x86_64-340.102-old/kernel/conftest.sh 2017-01-16
21:15:32.0 +0100
NVIDIA-Linux-x86_64-340.102-new/kernel/conftest.sh 2017-07-05
20:58:45.28334 +0200
+@@ -362,7 +362,11 @@
+ # Determine if the set_memory_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_memory_uc(void) {
+ set_memory_uc();
+ }"
+@@ -375,7 +379,11 @@
+ # Determine if the set_memory_array_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_memory_array_uc(void) {
+ set_memory_array_uc();
+ }"
+@@ -388,7 +396,11 @@
+ # Determine if the set_pages_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_pages_uc(void) {
+ set_pages_uc();
+ }"
+diff -Naur NVIDIA-Linux-x86_64-340.102-old/kernel/nv-vm.c
NVIDIA-Linux-x86_64-340.102-new/kernel/nv-vm.c
+--- NVIDIA-Linux-x86_64-340.102-old/kernel/nv-vm.c 2017-01-16
21:15:32.0 +0100
NVIDIA-Linux-x86_64-340.102-new/kernel/nv-vm.c 2017-07-05
20:58:45.28667 +0200
+@@ -13,6 +13,10 @@
+ #include "nv.h"
+ #include "nv-linux.h"
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#endif
++
+ static inline void nv_set_contig_memory_uc(nv_pte_t *page_ptr, NvU32
num_pages)
+ {
+ if (nv_update_memory_types)
+diff -Naur NVIDIA-Linux-x86_64-340.102-old/kernel/uvm/conftest.sh
NVIDIA-Linux-x86_64-340.102-new/kernel/uvm/conftest.sh
+--- NVIDIA-Linux-x86_64-340.102-old/kernel/uvm/conftest.sh 2017-01-16
21:15:33.0 +0100
NVIDIA-Linux-x86_64-340.102-new/kernel/uvm/conftest.sh 2017-07-05
20:58:45.28667 +0200
+@@ -362,7 +362,11 @@
+ # Determine if the set_memory_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_memory_uc(void) {
+ set_memory_uc();
+ }"
+@@ -375,7 +379,11 @@
+ # Determine if the set_memory_array_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_memory_array_uc(void) {
+ set_memory_array_uc();
+ }"
+@@ -388,7 +396,11 @@
+ # Determine if the set_pages_uc() function is present.
+ #
+ CODE="
+-#include
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
++#include
++#else
++#include
++#endif
+ void conftest_set_pages_uc(void) {
+ set_pages_uc();
+ }"
Modified: PKGBUILD
===
--- PKGBUILD2017-07-13 12:49:37 UTC (rev 300245)
+++ PKGBUILD2017-07-13 12:54:25 UTC (rev 300246)
@@ -5,20 +5,21 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.102
-_extramodules=extramodules-4.11-ARCH
-pkgrel=9
+_extramodules=extramodules-4.12-ARCH
+pkgrel=10
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.11'
'linux-headers<4.12')
+makedepends=("nvidia-340xx-utils=${pkgver}" 'li
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Monday, May 22, 2017 @ 13:09:13
Author: tpowa
Revision: 296407
upgpkg: nvidia-340xx 340.102-7
bump to 4.11.2
Added:
nvidia-340xx/trunk/4.11.0_kernel.patch
Modified:
nvidia-340xx/trunk/PKGBUILD
nvidia-340xx/trunk/nvidia-340xx.install
--+
4.11.0_kernel.patch | 112 +
PKGBUILD | 14 +++---
nvidia-340xx.install |2
3 files changed, 121 insertions(+), 7 deletions(-)
Added: 4.11.0_kernel.patch
===
--- 4.11.0_kernel.patch (rev 0)
+++ 4.11.0_kernel.patch 2017-05-22 13:09:13 UTC (rev 296407)
@@ -0,0 +1,112 @@
+--- a/kernel/nv-drm.c
b/kernel/nv-drm.c
+@@ -22,6 +22,8 @@
+ #include
+ #endif
+
++#include
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+@@ -48,7 +50,11 @@
+ return -ENODEV;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nv_drm_unload(
++#else
++static void nv_drm_unload(
++#endif
+ struct drm_device *dev
+ )
+ {
+@@ -60,11 +66,19 @@
+ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return 0;
++#else
++return;
++#endif
+ }
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return -ENODEV;
++#else
++return;
++#endif
+ }
+
+ static void nv_gem_free(
+
+--- a/kernel/uvm/nvidia_uvm_linux.h
b/kernel/uvm/nvidia_uvm_linux.h
+@@ -124,6 +124,9 @@
+ #include /* mdelay, udelay */
+
+ #include /* suser(), capable() replacement */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include
++#endif
+ #include /* module_param() */
+ #if !defined(NV_VMWARE)
+ #include/* flush_tlb(), flush_tlb_all() */
+@@ -362,6 +365,7 @@
+ void address_space_init_once(struct address_space *mapping);
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ #if !defined(NV_FATAL_SIGNAL_PENDING_PRESENT)
+ static inline int __fatal_signal_pending(struct task_struct *p)
+ {
+@@ -372,6 +376,7 @@
+ {
+ return signal_pending(p) && __fatal_signal_pending(p);
+ }
++#endif
+ #endif
+
+ //
+
+--- a/kernel/uvm/nvidia_uvm_lite.c
b/kernel/uvm/nvidia_uvm_lite.c
+@@ -818,7 +818,11 @@
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _fault(struct vm_fault *vmf)
++#else
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++retval = _fault_common(NULL, vaddr, &page, vmf->flags);
++#else
+ retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#endif
+
+ vmf->page = page;
+
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _sigbus_fault(struct vm_fault *vmf)
++#else
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;
+
Modified: PKGBUILD
===
--- PKGBUILD2017-05-22 13:02:08 UTC (rev 296406)
+++ PKGBUILD2017-05-22 13:09:13 UTC (rev 296407)
@@ -5,19 +5,20 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.102
-_extramodules=extramodules-4.10-ARCH
-pkgrel=6
+_extramodules=extramodules-4.11-ARCH
+pkgrel=7
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.10'
'linux-headers<4.11')
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.11'
'linux-headers<4.12')
conflicts=('nvidia')
license=('custom')
options=(!strip)
-source=('fs52243.patch' '4.10.0_kernel.patch')
+source=('fs52243.patch' '4.10.0_kernel.patch' '4.11.0_kernel.patch')
source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run";)
source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run";)
sha512sums=('de4f697d64f8e73c4aadec1a407884a6bc459c0020d4bfd19740fe4177a60bb801fe8a74ef6f7fa2e89c6cd648ea4daf152799ae344a145c06480a6eef0c5bca'
-
'88a2b448c1e8445dc43820328e86d8f20eb7e3cb5774e704cd44191a9fa26064264510c1adc9ea938fa2c92075496f3a27bd52ae6e6f4ec5fa6d4a829dd961e8')
+
'88a2b448c1e8445dc43820328e86d8f20eb7e3cb5774e704cd44191a9fa26064264510c1adc9ea938fa2c92075496f3a27bd52ae6e6f4ec5fa6d4a829dd961e8'
+
'48eb48dfd118a5d76d0e01c3bb5aedb7e6ec153a40680c0e
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Sunday, February 26, 2017 @ 22:21:36
Author: heftig
Revision: 289581
340.102-4
Added:
nvidia-340xx/trunk/4.10.0_kernel.patch
Modified:
nvidia-340xx/trunk/PKGBUILD
nvidia-340xx/trunk/nvidia-340xx.install
--+
4.10.0_kernel.patch | 131 +
PKGBUILD | 14 ++---
nvidia-340xx.install |2
3 files changed, 140 insertions(+), 7 deletions(-)
Added: 4.10.0_kernel.patch
===
--- 4.10.0_kernel.patch (rev 0)
+++ 4.10.0_kernel.patch 2017-02-26 22:21:36 UTC (rev 289581)
@@ -0,0 +1,131 @@
+From 983a2ca221a371e08bb5ad11758a729cfa5aa88c Mon Sep 17 00:00:00 2001
+From: Alberto Milone
+Date: Wed, 15 Feb 2017 17:05:55 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.10
+
+---
+ nv-linux.h| 7 +++
+ nv-pat.c | 40
+ uvm/nvidia_uvm_lite.c | 4
+ 3 files changed, 51 insertions(+)
+
+diff --git a/kernel/nv-linux.h b/kernel/nv-linux.h
+index e7068e3..2d62492 100644
+--- a/kernel/nv-linux.h
b/kernel/nv-linux.h
+@@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
+ *2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
+ */
+
++#include
++
+ #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
+ #define NV_GET_USER_PAGES get_user_pages
+@@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
+
+ #else
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
+ pages, vmas);
++#else
++ return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
++pages, vmas, NULL);
++#endif
+
+ #endif
+
+diff --git a/kernel/nv-pat.c b/kernel/nv-pat.c
+index a725533..cec6f3f 100644
+--- a/kernel/nv-pat.c
b/kernel/nv-pat.c
+@@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
+ }
+
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ static int
+ nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void
*hcpu)
+ {
+@@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
+ .notifier_call = nvidia_cpu_callback,
+ .priority = 0
+ };
++#else
++static int nvidia_cpu_online(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_setup_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
++
++put_cpu();
++
++return 0;
++}
++
++static int nvidia_cpu_down_prep(unsigned int hcpu)
++{
++unsigned int cpu = get_cpu();
++if (cpu == hcpu)
++nv_restore_pat_entries(NULL);
++else
++NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu,
1);
++
++put_cpu();
++
++return 0;
++}
++#endif
++
+ #endif
+
+ int nv_init_pat_support(nv_stack_t *sp)
+@@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
+ if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
++#else
++if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
++ "gpu/nvidia:online",
++ nvidia_cpu_online,
++ nvidia_cpu_down_prep) != 0)
++#endif
+ {
+ nv_disable_pat_support();
+ nv_printf(NV_DBG_ERRORS,
+@@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)
+ {
+ nv_disable_pat_support();
+ #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unregister_hotcpu_notifier(&nv_hotcpu_nfb);
++#else
++cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
++#endif
+ #endif
+ }
+ }
+diff --git a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c
+index 9627f60..2158b45 100644
+--- a/kernel/uvm/nvidia_uvm_lite.c
b/kernel/uvm/nvidia_uvm_lite.c
+@@ -820,7 +820,11 @@ done:
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;
++#else
++unsigned long vaddr = (unsigned long)vmf->address;
++#endif
+ struct page *page = NULL;
+ int retval;
+
+--
+2.7.4
+
Modified: PKGBUILD
===
--- PKGBUILD2017-02-26 22:16:25 UTC (rev 289580)
+++ PKGBUILD2017-02-26 22:21:36 UTC (rev 289581)
@@ -5,18 +5
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Wednesday, August 10, 2016 @ 07:13:12
Author: tpowa
Revision: 273567
upgpkg: nvidia-340xx 340.96-14
rebuild for 4.7 series
Modified:
nvidia-340xx/trunk/PKGBUILD
nvidia-340xx/trunk/nvidia-340xx.install
Deleted:
nvidia-340xx/trunk/linux-4.6.patch
--+
PKGBUILD |8 +-
linux-4.6.patch | 150 -
nvidia-340xx.install |2
3 files changed, 5 insertions(+), 155 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-10 07:04:41 UTC (rev 273566)
+++ PKGBUILD2016-08-10 07:13:12 UTC (rev 273567)
@@ -5,11 +5,11 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.96
-_extramodules=extramodules-4.6-ARCH
-pkgrel=13
+_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.6' 'linux-headers<4.7')
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}"
'linux' 'linux-headers>=4.7' 'linux-headers<4.8')
conflicts=('nvidia')
license=('custom')
options=(!strip)
@@ -43,7 +43,7 @@
package_nvidia-340xx() {
pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.6' 'linux<4.7' 'libgl' "nvidia-340xx-utils=${pkgver}")
+depends=('linux>=4.7' 'linux<4.8' 'libgl' "nvidia-340xx-utils=${pkgver}")
conflict+=('nvidia-340xx-dkms')
install=nvidia-340xx.install
Deleted: linux-4.6.patch
===
--- linux-4.6.patch 2016-08-10 07:04:41 UTC (rev 273566)
+++ linux-4.6.patch 2016-08-10 07:13:12 UTC (rev 273567)
@@ -1,150 +0,0 @@
/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_REMOTEget_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_REMOTEget_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,
-+
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Tuesday, November 17, 2015 @ 13:09:07
Author: fyan
Revision: 251117
upgpkg: nvidia-340xx 340.96-1
Modified:
nvidia-340xx/trunk/PKGBUILD
Deleted:
nvidia-340xx/trunk/nv-drm.patch
nvidia-340xx/trunk/nvidia-4.3-build.patch
+
PKGBUILD | 14 --
nv-drm.patch | 27 ---
nvidia-4.3-build.patch | 20
3 files changed, 4 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-17 12:01:39 UTC (rev 251116)
+++ PKGBUILD2015-11-17 12:09:07 UTC (rev 251117)
@@ -4,9 +4,9 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
-pkgver=340.93
+pkgver=340.96
_extramodules=extramodules-4.3-ARCH
-pkgrel=5
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}"
'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
@@ -13,14 +13,10 @@
conflicts=('nvidia')
license=('custom')
options=(!strip)
-source=(nv-drm.patch
-nvidia-4.3-build.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=('79671a27131da619a33eb02ed0c2c031'
- 'e400a8c538afd490726941d8c69b2c2d')
-md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
-md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
+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"
@@ -29,8 +25,6 @@
sh "${_pkg}.run" --extract-only
cd "${_pkg}"
# patches here
-patch -p0 -i ../nv-drm.patch
-patch -Np1 -i ../nvidia-4.3-build.patch
}
build() {
Deleted: nv-drm.patch
===
--- nv-drm.patch2015-11-17 12:01:39 UTC (rev 251116)
+++ nv-drm.patch2015-11-17 12:09:07 UTC (rev 251117)
@@ -1,27 +0,0 @@
kernel/nv-drm.c~ 2014-09-12 00:33:06.0 +0200
-+++ kernel/nv-drm.c 2014-10-14 11:35:52.854400737 +0200
-@@ -18,6 +18,11 @@
-
- #include
-
-+/* 3.18-rc0+ */
-+#ifndef drm_gem_object
-+#include
-+#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",
Deleted: nvidia-4.3-build.patch
===
--- nvidia-4.3-build.patch 2015-11-17 12:01:39 UTC (rev 251116)
+++ nvidia-4.3-build.patch 2015-11-17 12:09:07 UTC (rev 251117)
@@ -1,20 +0,0 @@
a/kernel/nv-procfs.c
-+++ b/kernel/nv-procfs.c
-@@ -360,7 +360,8 @@ nv_procfs_read_registry(
- registry_keys = ((nvl != NULL) ?
- nvl->registry_keys : nv_registry_keys);
-
--return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+seq_printf(s, "Binary: \"%s\"\n", registry_keys);
-+return 0;
- }
-
- static ssize_t
-@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
- void *v
- )
- {
--return seq_puts(s, s->private);
-+seq_puts(s, s->private);
-+return 0;
- }
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Wednesday, November 4, 2015 @ 16:08:11
Author: tpowa
Revision: 250102
upgpkg: nvidia-340xx 340.93-5
rebuild against 4.3 series
Added:
nvidia-340xx/trunk/nvidia-4.3-build.patch
Modified:
nvidia-340xx/trunk/PKGBUILD
nvidia-340xx/trunk/nvidia-340xx.install
+
PKGBUILD | 15 +--
nvidia-340xx.install |2 +-
nvidia-4.3-build.patch | 20
3 files changed, 30 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-04 14:46:39 UTC (rev 250101)
+++ PKGBUILD2015-11-04 15:08:11 UTC (rev 250102)
@@ -5,18 +5,20 @@
pkgbase=nvidia-340xx
pkgname=(nvidia-340xx nvidia-340xx-dkms)
pkgver=340.93
-_extramodules=extramodules-4.2-ARCH
-pkgrel=4
+_extramodules=extramodules-4.3-ARCH
+pkgrel=5
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
-makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}"
'linux' 'linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}"
'linux' 'linux-headers>=4.3' 'linux-headers<4.4')
conflicts=('nvidia')
license=('custom')
options=(!strip)
-source=(nv-drm.patch)
+source=(nv-drm.patch
+nvidia-4.3-build.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=('79671a27131da619a33eb02ed0c2c031')
+md5sums=('79671a27131da619a33eb02ed0c2c031'
+ 'e400a8c538afd490726941d8c69b2c2d')
md5sums_i686=('4a7edf6838a80c77a57fb6f6ec7f0437')
md5sums_x86_64=('cb80e3f1cb6f2fb6e6eab35fad0884e4')
@@ -28,6 +30,7 @@
cd "${_pkg}"
# patches here
patch -p0 -i ../nv-drm.patch
+patch -Np1 -i ../nvidia-4.3-build.patch
}
build() {
@@ -41,7 +44,7 @@
package_nvidia-340xx() {
pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
-depends=('linux>=4.2' 'linux<4.3' 'libgl' "nvidia-340xx-utils=${pkgver}")
+depends=('linux>=4.3' 'linux<4.4' 'libgl' "nvidia-340xx-utils=${pkgver}")
conflict+=('nvidia-340xx-dkms')
install=nvidia-340xx.install
Modified: nvidia-340xx.install
===
--- nvidia-340xx.install2015-11-04 14:46:39 UTC (rev 250101)
+++ nvidia-340xx.install2015-11-04 15:08:11 UTC (rev 250102)
@@ -1,5 +1,5 @@
post_install() {
-EXTRAMODULES='extramodules-4.2-ARCH'
+EXTRAMODULES='extramodules-4.3-ARCH'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
echo 'In order to use nvidia module, reboot the system.'
}
Added: nvidia-4.3-build.patch
===
--- nvidia-4.3-build.patch (rev 0)
+++ nvidia-4.3-build.patch 2015-11-04 15:08:11 UTC (rev 250102)
@@ -0,0 +1,20 @@
+--- a/kernel/nv-procfs.c
b/kernel/nv-procfs.c
+@@ -360,7 +360,8 @@ nv_procfs_read_registry(
+ registry_keys = ((nvl != NULL) ?
+ nvl->registry_keys : nv_registry_keys);
+
+-return seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++seq_printf(s, "Binary: \"%s\"\n", registry_keys);
++return 0;
+ }
+
+ static ssize_t
+@@ -560,7 +561,8 @@ nv_procfs_read_text_file(
+ void *v
+ )
+ {
+-return seq_puts(s, s->private);
++seq_puts(s, s->private);
++return 0;
+ }
[arch-commits] Commit in nvidia-340xx/trunk (3 files)
Date: Friday, September 4, 2015 @ 07:45:54
Author: fyan
Revision: 245255
upgpkg: nvidia-340xx 340.93-1
- upstream new version
- add a DKMS version
Added:
nvidia-340xx/trunk/nvidia-340xx-dkms.install
Modified:
nvidia-340xx/trunk/PKGBUILD (contents, properties)
Deleted:
nvidia-340xx/trunk/nvidia-4.0.patch
---+
PKGBUILD | 47 +---
nvidia-340xx-dkms.install | 30
nvidia-4.0.patch | 28 --
3 files changed, 61 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-09-04 03:45:53 UTC (rev 245254)
+++ PKGBUILD2015-09-04 05:45:54 UTC (rev 245255)
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 221857 2014-09-17 20:29:16Z tpowa $
+# $Id$
# Maintainer : Thomas Baechler
-pkgname=nvidia-340xx
-pkgver=340.76
+pkgbase=nvidia-340xx
+pkgname=(nvidia-340xx nvidia-340xx-dkms)
+pkgver=340.93
_extramodules=extramodules-4.2-ARCH
-pkgrel=15
-pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.nvidia.com/";
-depends=('linux>=4.2' 'linux<4.3' 'nvidia-340xx-libgl'
"nvidia-340xx-utils=${pkgver}")
-makedepends=('linux-headers>=4.2' 'linux-headers<4.3')
+makedepends=("nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.2'
'linux-headers<4.3')
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')
+nv-drm.patch)
+md5sums=('4a7edf6838a80c77a57fb6f6ec7f0437'
+ 'cb80e3f1cb6f2fb6e6eab35fad0884e4'
+ '79671a27131da619a33eb02ed0c2c031')
[[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
[[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
@@ -31,7 +27,6 @@
cd "${_pkg}"
# patches here
patch -p0 -i ../nv-drm.patch
-patch -p0 -i ../nvidia-4.0.patch
}
build() {
@@ -43,7 +38,12 @@
make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
}
-package() {
+package_nvidia-340xx() {
+pkgdesc="NVIDIA drivers for linux, 340xx legacy branch"
+depends=('linux>=4.2' 'linux<4.3' '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" \
@@ -52,3 +52,18 @@
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')
+conflict+=('nvidia-340xx')
+install=nvidia-340xx-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
+}
Property changes on: nvidia-340xx/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: nvidia-340xx-dkms.install
===
--- nvidia-340xx-dkms.install (rev 0)
+++ nvidia-340xx-dkms.install 2015-09-04 05:45:54 UTC (rev 245255)
@@ -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:
Deleted: nvidia-4.0.patch
===
--- nvidia-4.0.patch2015-09-04 03:45:53 UTC (r
