From 6b26c8d0e86aba93a57ede5769e1d3643d49d2dc Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Wed, 20 Sep 2017 20:12:46 +0200 Subject: [PATCH] nvidia340: update to 340.104 --- srcpkgs/nvidia340/files/4.10.0_kernel.patch | 111 -------------------- srcpkgs/nvidia340/files/linux-4.11.patch | 108 ------------------- srcpkgs/nvidia340/files/linux-4.12.patch | 95 ----------------- srcpkgs/nvidia340/files/patch_nv1.diff | 14 --- srcpkgs/nvidia340/template | 16 +-- 5 files changed, 4 insertions(+), 340 deletions(-) delete mode 100644 srcpkgs/nvidia340/files/4.10.0_kernel.patch delete mode 100644 srcpkgs/nvidia340/files/linux-4.11.patch delete mode 100644 srcpkgs/nvidia340/files/linux-4.12.patch delete mode 100644 srcpkgs/nvidia340/files/patch_nv1.diff diff --git a/srcpkgs/nvidia340/files/4.10.0_kernel.patch b/srcpkgs/nvidia340/files/4.10.0_kernel.patch deleted file mode 100644 index d15bf38ce8d..00000000000 --- a/srcpkgs/nvidia340/files/4.10.0_kernel.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- kernel/nv-linux.h -+++ 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 - ---- kernel/nv-pat.c -+++ 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 - } - } - ---- kernel/uvm/nvidia_uvm_lite.c -+++ 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; diff --git a/srcpkgs/nvidia340/files/linux-4.11.patch b/srcpkgs/nvidia340/files/linux-4.11.patch deleted file mode 100644 index f533f08e512..00000000000 --- a/srcpkgs/nvidia340/files/linux-4.11.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- kernel/nv-drm.c 2017-03-31 03:42:21.000000000 +0200 -+++ kernel/nv-drm.c 2017-04-06 23:53:14.273356795 +0200 -@@ -48,7 +48,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,7 +60,11 @@ - { - BUG_ON(nvl->drm != dev); - nvl->drm = NULL; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - return 0; -+#else -+ return; -+#endif - } - } - -@@ -64,7 +64,11 @@ - } - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - return -ENODEV; -+#else -+ return; -+#endif - } - - static void nv_gem_free( ---- kernel/uvm/nvidia_uvm_linux.h 2017-03-31 03:42:21.000000000 +0200 -+++ kernel/uvm/nvidia_uvm_linux.h 2017-04-06 23:53:14.273356795 +0200 -@@ -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,17 +363,19 @@ - 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) - { - return unlikely(sigismember(&p->pending.signal, SIGKILL)); - } - - static inline int fatal_signal_pending(struct task_struct *p) - { - return signal_pending(p) && __fatal_signal_pending(p); - } - #endif -+#endif - - // - // Before the current->cred structure was introduced, current->euid, ---- kernel/uvm/nvidia_uvm_lite.c 2017-03-31 03:42:21.000000000 +0200 -+++ kernel/uvm/nvidia_uvm_lite.c 2017-04-06 23:53:14.273356795 +0200 -@@ -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_area_struct *vma, struct vm_fault *vmf) -+#else -+int _fault(struct vm_fault *vmf) -+#endif - { - unsigned long vaddr = (unsigned long)vmf->virtual_address; - struct page *page = NULL; -@@ -828,7 +828,11 @@ - struct page *page = NULL; - int retval; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - retval = _fault_common(vma, vaddr, &page, vmf->flags); -+#else -+ retval = _fault_common(NULL, vaddr, &page, vmf->flags); -+#endif - - vmf->page = page; - -@@ -866,7 +866,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_area_struct *vma, struct vm_fault *vmf) -+#else -+int _sigbus_fault(struct vm_fault *vmf) -+#endif - { - vmf->page = NULL; - return VM_FAULT_SIGBUS; diff --git a/srcpkgs/nvidia340/files/linux-4.12.patch b/srcpkgs/nvidia340/files/linux-4.12.patch deleted file mode 100644 index 87c50d6f497..00000000000 --- a/srcpkgs/nvidia340/files/linux-4.12.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- kernel/conftest.sh.orig 2017-07-04 19:34:18.849964147 +0200 -+++ kernel/conftest.sh 2017-07-04 19:40:00.084349448 +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(); - }" ---- kernel/uvm/conftest.sh.orig 2017-07-04 19:41:43.317660686 +0200 -+++ kernel/uvm/conftest.sh 2017-07-04 19:40:23.248644401 +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(); - }" ---- kernel/nv-vm.c.orig 2017-07-04 20:01:37.098802679 +0200 -+++ kernel/nv-vm.c 2017-07-04 20:02:23.720384972 +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 --git a/srcpkgs/nvidia340/files/patch_nv1.diff b/srcpkgs/nvidia340/files/patch_nv1.diff deleted file mode 100644 index b6dc35a2e7f..00000000000 --- a/srcpkgs/nvidia340/files/patch_nv1.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- kernel/nv-drm.c 2016-12-15 12:41:26.000000000 +0100 -+++ kernel/nv-drm.c 2016-12-15 12:58:48.000000000 +0100 -@@ -115,7 +115,11 @@ - }; - - static struct drm_driver nv_drm_driver = { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) -+ .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY, -+#else - .driver_features = DRIVER_GEM | DRIVER_PRIME, -+#endif - .load = nv_drm_load, - .unload = nv_drm_unload, - .fops = &nv_drm_fops, diff --git a/srcpkgs/nvidia340/template b/srcpkgs/nvidia340/template index 92433e64a99..7aba09590bb 100644 --- a/srcpkgs/nvidia340/template +++ b/srcpkgs/nvidia340/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers (GeForce 8, 9, 9M, 100, 100M, 200, 300 series)" pkgname=nvidia340 -version=340.102 -revision=5 +version=340.104 +revision=1 maintainer="Juan RP " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -24,11 +24,11 @@ subpackages="${pkgname}-dkms ${pkgname}-opencl ${pkgname}-libs" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://us.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=61b13d5dae0f6f5d788a4d8c4c98e8d971d19cb90b606058060d007946248828 + checksum=e39015f8e2c6c87037be340fd1899f703ac15356c5694ad8187cd67e71491cd1 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=6a36bd9a0033769ecd11ce2aa60aeb41b50b20616c43fd19c55e027c451f585e + checksum=ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada fi do_extract() { @@ -38,14 +38,6 @@ do_extract() { rm -f ${_pkg}.run } -do_configure() { - cd ${_pkg} - patch -p0 < ${FILESDIR}/patch_nv1.diff - patch -p0 < ${FILESDIR}/4.10.0_kernel.patch - patch -p0 < ${FILESDIR}/linux-4.11.patch - patch -p0 < ${FILESDIR}/linux-4.12.patch -} - do_install() { cd ${_pkg}