From 6c8835e775f0a97cc97c42bf705de0b085541943 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 19 Sep 2017 17:56:56 +0100 Subject: [PATCH] xf86-video-nvidia-legacy: update to xf86-video-nvidia-legacy-340.104 --- .../xf86-video-nvidia-legacy/package.mk | 4 +- ...-video-nvidia-legacy-0010-kernel-4.9.patch | 15 --- ...video-nvidia-legacy-0020-kernel-4.10.patch | 114 ----------------- ...video-nvidia-legacy-0030-kernel-4.11.patch | 89 -------------- ...video-nvidia-legacy-0040-kernel-4.12.patch | 116 ------------------ 5 files changed, 2 insertions(+), 336 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0010-kernel-4.9.patch delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0020-kernel-4.10.patch delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0030-kernel-4.11.patch delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0040-kernel-4.12.patch diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index a1ed8f5a7a..6b7512c1cb 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -17,8 +17,8 @@ ################################################################################ PKG_NAME="xf86-video-nvidia-legacy" -PKG_VERSION="340.102" -PKG_SHA256="6a36bd9a0033769ecd11ce2aa60aeb41b50b20616c43fd19c55e027c451f585e" +PKG_VERSION="340.104" +PKG_SHA256="ed112523ae424aea46904d2dcfc769b0263cf552f5bfec0e30601f6f0f95eada" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0010-kernel-4.9.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0010-kernel-4.9.patch deleted file mode 100644 index 6a47f79374..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0010-kernel-4.9.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c ---- a/kernel/nv-drm.c 2016-12-15 12:41:26.000000000 +0100 -+++ b/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/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0020-kernel-4.10.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0020-kernel-4.10.patch deleted file mode 100644 index 01b72b85d4..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0020-kernel-4.10.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -Naur a/kernel/nv-linux.h b/kernel/nv-linux.h ---- 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 -Naur a/kernel/nv-pat.c b/kernel/nv-pat.c ---- 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 -Naur a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c ---- 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; - diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0030-kernel-4.11.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0030-kernel-4.11.patch deleted file mode 100644 index da15ce1c23..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0030-kernel-4.11.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -Naur a/kernel/nv-drm.c b/kernel/nv-drm.c ---- a/kernel/nv-drm.c 2017-03-31 03:42:21.000000000 +0200 -+++ b/kernel/nv-drm.c 2017-04-06 23:53:14.273356795 +0200 -@@ -48,7 +48,7 @@ - return -ENODEV; - } - --static int nv_drm_unload( -+static void nv_drm_unload( - struct drm_device *dev - ) - { -@@ -60,7 +60,7 @@ - { - BUG_ON(nvl->drm != dev); - nvl->drm = NULL; -- return 0; -+ return; - } - } - -@@ -64,7 +64,7 @@ - } - } - -- return -ENODEV; -+ return; - } - - static void nv_gem_free( -diff -Naur a/kernel/uvm/nvidia_uvm_linux.h b/kernel/uvm/nvidia_uvm_linux.h ---- a/kernel/uvm/nvidia_uvm_linux.h 2017-03-31 03:42:21.000000000 +0200 -+++ b/kernel/uvm/nvidia_uvm_linux.h 2017-04-06 23:53:14.273356795 +0200 -@@ -124,6 +124,7 @@ - #include /* mdelay, udelay */ - - #include /* suser(), capable() replacement */ -+#include - #include /* module_param() */ - #if !defined(NV_VMWARE) - #include /* flush_tlb(), flush_tlb_all() */ -@@ -362,17 +363,6 @@ - void address_space_init_once(struct address_space *mapping); - #endif - --#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 - - // - // Before the current->cred structure was introduced, current->euid, -diff -Naur a/kernel/uvm/nvidia_uvm_lite.c b/kernel/uvm/nvidia_uvm_lite.c ---- a/kernel/uvm/nvidia_uvm_lite.c 2017-03-31 03:42:21.000000000 +0200 -+++ b/kernel/uvm/nvidia_uvm_lite.c 2017-04-06 23:53:14.273356795 +0200 -@@ -818,7 +818,7 @@ - } - - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) --int _fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+int _fault(struct vm_fault *vmf) - { - unsigned long vaddr = (unsigned long)vmf->virtual_address; - struct page *page = NULL; -@@ -828,7 +828,7 @@ - struct page *page = NULL; - int retval; - -- retval = _fault_common(vma, vaddr, &page, vmf->flags); -+ retval = _fault_common(NULL, vaddr, &page, vmf->flags); - - vmf->page = page; - -@@ -866,7 +866,7 @@ - // it's dealing with anonymous mapping (see handle_pte_fault). - // - #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT) --int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+int _sigbus_fault(struct vm_fault *vmf) - { - vmf->page = NULL; - return VM_FAULT_SIGBUS; diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0040-kernel-4.12.patch b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0040-kernel-4.12.patch deleted file mode 100644 index 8a8fe4262e..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-0040-kernel-4.12.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 5afc687f2f2fb085c5470e7cadff7c936239130a Mon Sep 17 00:00:00 2001 -From: MilhouseVH -Date: Thu, 13 Jul 2017 06:17:12 +0100 -Subject: [PATCH] Fix build with kernel 4.12.y - -See: https://devtalk.nvidia.com/default/topic/1008771/linux/nvidia-340-xx-compile-error-with-kernel-4-12-rc1/post/5179612/#5179612 ---- - kernel/conftest.sh | 18 +++++++++++++++--- - kernel/nv-vm.c | 4 ++++ - kernel/uvm/conftest.sh | 18 +++++++++++++++--- - 3 files changed, 34 insertions(+), 6 deletions(-) - -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index d74ddf3..a412a45 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -362,7 +362,11 @@ compile_test() { - # 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 @@ compile_test() { - # 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 @@ compile_test() { - # 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 --git a/kernel/nv-vm.c b/kernel/nv-vm.c -index 0a9e59e..ef04694 100644 ---- a/kernel/nv-vm.c -+++ b/kernel/nv-vm.c -@@ -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/kernel/uvm/conftest.sh b/kernel/uvm/conftest.sh -index d74ddf3..a412a45 100755 ---- a/kernel/uvm/conftest.sh -+++ b/kernel/uvm/conftest.sh -@@ -362,7 +362,11 @@ compile_test() { - # 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 @@ compile_test() { - # 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 @@ compile_test() { - # 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(); - }" --- -2.7.4 -