diff options
author | cyano | 2017-03-07 01:10:45 +0000 |
---|---|---|
committer | cyano | 2017-03-07 01:10:45 +0000 |
commit | e85f75925241ab2d6febb1ecbb500fada7cffecd (patch) | |
tree | 2550cd7dff02c0e9fc330edd10c17078bbc6a62a | |
parent | 589c145b18b61879ddc778d673da75b13923c3a6 (diff) | |
download | aur-e85f75925241ab2d6febb1ecbb500fada7cffecd.tar.gz |
updated to 378.13-3, for kernel 4.10
-rw-r--r-- | .SRCINFO | 36 | ||||
-rw-r--r-- | 0001-linux-4.7-i686.patch | 46 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | fix-abi.patch | 12 | ||||
-rw-r--r-- | kernel_4.10.patch | 382 | ||||
-rw-r--r-- | nvidia.install | 13 |
6 files changed, 426 insertions, 108 deletions
@@ -1,38 +1,26 @@ -# Generated by mksrcinfo v8 -# Thu Aug 18 06:12:41 UTC 2016 pkgbase = nvidia-pae pkgdesc = NVIDIA drivers for linux - pkgver = 367.35 - pkgrel = 1 + pkgver = 378.13 + pkgrel = 3 url = http://www.nvidia.com/ arch = i686 license = custom makedepends = nvidia-libgl - makedepends = nvidia-utils=367.35 + makedepends = nvidia-utils=378.13 makedepends = linux-pae - makedepends = linux-pae-headers>=4.7 - makedepends = linux-pae-headers<4.8 + makedepends = linux-pae-headers>=4.10 + makedepends = linux-pae-headers<4.11 options = !strip - source = http://us.download.nvidia.com/XFree86/Linux-x86/367.35/NVIDIA-Linux-x86-367.35.run - source = 0001-linux-4.7-i686.patch - md5sums = 42db6f6485c3c337c7c756380ec64b7a - md5sums = 0ceb49f5c537ae60743fdf7177eb996e + source = kernel_4.10.patch + source = http://us.download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run + md5sums = e81769b830b7a1e60c635e3bbe559f59 + md5sums = dd1077750af9a067739ec291fb24175f pkgname = nvidia-pae pkgdesc = NVIDIA drivers for linux install = nvidia.install - depends = linux-pae>=4.7 - depends = linux-pae<4.8 - depends = nvidia-utils=367.35 + depends = linux-pae>=4.10 + depends = linux-pae<4.11 + depends = nvidia-utils=378.13 depends = libgl -pkgname = nvidia-pae-dkms - pkgdesc = NVIDIA driver sources for linux - depends = dkms - depends = nvidia-utils=367.35 - depends = libgl - optdepends = linux-pae-headers: Build the module for Arch PAE kernel - optdepends = linux-lts-headers: Build the module for LTS Arch kernel - conflicts = - conflicts = nvidia - diff --git a/0001-linux-4.7-i686.patch b/0001-linux-4.7-i686.patch deleted file mode 100644 index ec91dc405454..000000000000 --- a/0001-linux-4.7-i686.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c nvidia-367.35/nvidia-drm/nvidia-drm-fb.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-fb.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-fb.c 2016-08-06 00:38:00.550651165 +0200 -@@ -31,6 +31,7 @@ - #include "nvidia-drm-gem.h" - - #include <drm/drm_crtc_helper.h> -+#include <linux/version.h> - - static void nvidia_framebuffer_destroy(struct drm_framebuffer *fb) - { -@@ -114,7 +115,11 @@ - * We don't support any planar format, pick up first buffer only. - */ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); -+#else - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+#endif - - if (gem == NULL) - { -diff -u -r nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c nvidia-367.35/nvidia-drm/nvidia-drm-gem.c ---- nvidia-367.35-orig/nvidia-drm/nvidia-drm-gem.c 2016-07-15 18:58:50.000000000 +0200 -+++ nvidia-367.35/nvidia-drm/nvidia-drm-gem.c 2016-08-06 00:37:47.237546102 +0200 -@@ -27,6 +27,7 @@ - #include "nvidia-drm-priv.h" - #include "nvidia-drm-ioctl.h" - #include "nvidia-drm-gem.h" -+#include <linux/version.h> - - static struct nvidia_drm_gem_object *nvidia_drm_gem_new - ( -@@ -408,7 +409,11 @@ - - mutex_lock(&dev->struct_mutex); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) -+ gem = drm_gem_object_lookup(file, handle); -+#else - gem = drm_gem_object_lookup(dev, file, handle); -+#endif - - if (gem == NULL) - { @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 264861 2016-04-14 05:06:52Z tpowa $ +# Contributor: Cyano Hao <c@cyano.cn> +# $Id: PKGBUILD 289584 2017-02-26 22:41:48Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Maintainer: Felix Yan <felixonmars@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> -pkgbase=nvidia-pae -pkgname=(nvidia-pae nvidia-pae-dkms) -pkgver=367.35 -_extramodules=extramodules-4.7-pae -pkgrel=1 +pkgname=nvidia-pae +pkgver=378.13 +_extramodules=extramodules-4.10-pae +pkgrel=3 pkgdesc="NVIDIA drivers for linux" arch=('i686') url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-pae' 'linux-pae-headers>=4.7' 'linux-pae-headers<4.8') +makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux-pae' 'linux-pae-headers>=4.10' 'linux-pae-headers<4.11') license=('custom') options=('!strip') -# See nvidia-utils -source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run" 0001-linux-4.7-i686.patch) -md5sums=('42db6f6485c3c337c7c756380ec64b7a' - '0ceb49f5c537ae60743fdf7177eb996e') +source=('kernel_4.10.patch' "http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") +md5sums=('e81769b830b7a1e60c635e3bbe559f59' 'dd1077750af9a067739ec291fb24175f') _pkg="NVIDIA-Linux-x86-${pkgver}" -prepare() { +prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" - # patches here - patch -Np1 -d kernel < ../0001-linux-4.7-i686.patch + + patch -Np1 --no-backup-if-mismatch -i ../kernel_4.10.patch cp -a kernel kernel-dkms cd kernel-dkms @@ -48,9 +46,9 @@ build() { make SYSSRC=/usr/lib/modules/"${_kernver}/build" module } -package_nvidia-pae() { +package() { pkgdesc="NVIDIA drivers for linux" - depends=('linux-pae>=4.7' 'linux-pae<4.8' "nvidia-utils=${pkgver}" 'libgl') + depends=('linux-pae>=4.10' 'linux-pae<4.11' "nvidia-utils=${pkgver}" 'libgl') install=nvidia.install install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ @@ -63,18 +61,5 @@ package_nvidia-pae() { 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-pae-dkms() { - pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') - optdepends=('linux-pae-headers: Build the module for Arch PAE kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') - conflicts+=('nvidia') - - 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" + echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-pae.conf" } diff --git a/fix-abi.patch b/fix-abi.patch new file mode 100644 index 000000000000..5a3f8dfc43c1 --- /dev/null +++ b/fix-abi.patch @@ -0,0 +1,12 @@ +diff -u -r kernel/nvidia-drm/nvidia-drm-fence.c kernel-patched/nvidia-drm/nvidia-drm-fence.c +--- kernel/nvidia-drm/nvidia-drm-fence.c 2016-08-09 01:43:19.000000000 +0200 ++++ kernel-patched/nvidia-drm/nvidia-drm-fence.c 2016-08-25 14:31:34.419655564 +0200 +@@ -325,7 +325,7 @@ + struct nvidia_drm_gem_object *nv_gem; + }; + +-static void nvidia_drm_gem_prime_soft_fence_event ++static void NVKMS_KAPI_CALL nvidia_drm_gem_prime_soft_fence_event + ( + void *dataPtr, + NvU32 dataU32 diff --git a/kernel_4.10.patch b/kernel_4.10.patch new file mode 100644 index 000000000000..4ad9f8a3989a --- /dev/null +++ b/kernel_4.10.patch @@ -0,0 +1,382 @@ +From ca8b106738521823707f3567cedb41ca158792a3 Mon Sep 17 00:00:00 2001 +From: Alberto Milone <alberto.milone@canonical.com> +Date: Wed, 15 Feb 2017 10:53:42 +0100 +Subject: [PATCH 1/1] Add support for Linux 4.10 + +--- + common/inc/nv-mm.h | 9 ++++-- + nvidia-drm/nvidia-drm-fence.c | 72 +++++++++++++++++++++++++++++++++++++++++++ + nvidia-drm/nvidia-drm-gem.h | 6 ++++ + nvidia-drm/nvidia-drm-priv.h | 7 +++++ + nvidia/nv-pat.c | 40 ++++++++++++++++++++++++ + 5 files changed, 132 insertions(+), 2 deletions(-) + +diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h +index 06d7da4..e5cc56a 100644 +--- a/kernel/common/inc/nv-mm.h ++++ b/kernel/common/inc/nv-mm.h +@@ -46,6 +46,8 @@ + * 2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99 + */ + ++#include <linux/version.h> ++ + #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 +@@ -92,10 +94,13 @@ + pages, vmas, NULL); + + #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/nvidia-drm/nvidia-drm-fence.c b/kernel/nvidia-drm/nvidia-drm-fence.c +index 5e98c5f..fa2c508 100644 +--- a/kernel/nvidia-drm/nvidia-drm-fence.c ++++ b/kernel/nvidia-drm/nvidia-drm-fence.c +@@ -31,7 +31,11 @@ + + #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) + struct nv_fence { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence base; ++#else ++ struct dma_fence base; ++#endif + spinlock_t lock; + + struct nvidia_drm_device *nv_dev; +@@ -51,7 +55,11 @@ nv_fence_ready_to_signal(struct nv_fence *nv_fence) + + static const char *nvidia_drm_gem_prime_fence_op_get_driver_name + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence ++#else ++ struct dma_fence *fence ++#endif + ) + { + return "NVIDIA"; +@@ -59,7 +67,11 @@ static const char *nvidia_drm_gem_prime_fence_op_get_driver_name + + static const char *nvidia_drm_gem_prime_fence_op_get_timeline_name + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence ++#else ++ struct dma_fence *fence ++#endif + ) + { + return "nvidia.prime"; +@@ -67,7 +79,11 @@ static const char *nvidia_drm_gem_prime_fence_op_get_timeline_name + + static bool nvidia_drm_gem_prime_fence_op_signaled + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence ++#else ++ struct dma_fence *fence ++#endif + ) + { + struct nv_fence *nv_fence = container_of(fence, struct nv_fence, base); +@@ -99,7 +115,11 @@ unlock_struct_mutex: + + static bool nvidia_drm_gem_prime_fence_op_enable_signaling + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence ++#else ++ struct dma_fence *fence ++#endif + ) + { + bool ret = true; +@@ -107,7 +127,11 @@ static bool nvidia_drm_gem_prime_fence_op_enable_signaling + struct nvidia_drm_gem_object *nv_gem = nv_fence->nv_gem; + struct nvidia_drm_device *nv_dev = nv_fence->nv_dev; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + if (fence_is_signaled(fence)) ++#else ++ if (dma_fence_is_signaled(fence)) ++#endif + { + return false; + } +@@ -136,7 +160,11 @@ static bool nvidia_drm_gem_prime_fence_op_enable_signaling + } + + nv_gem->fenceContext.softFence = fence; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_get(fence); ++#else ++ dma_fence_get(fence); ++#endif + + unlock_struct_mutex: + mutex_unlock(&nv_dev->dev->struct_mutex); +@@ -146,7 +174,11 @@ unlock_struct_mutex: + + static void nvidia_drm_gem_prime_fence_op_release + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence ++#else ++ struct dma_fence *fence ++#endif + ) + { + struct nv_fence *nv_fence = container_of(fence, struct nv_fence, base); +@@ -155,7 +187,11 @@ static void nvidia_drm_gem_prime_fence_op_release + + static signed long nvidia_drm_gem_prime_fence_op_wait + ( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence, ++#else ++ struct dma_fence *fence, ++#endif + bool intr, + signed long timeout + ) +@@ -170,12 +206,20 @@ static signed long nvidia_drm_gem_prime_fence_op_wait + * that it should never get hit during normal operation, but not so long + * that the system becomes unresponsive. + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + return fence_default_wait(fence, intr, ++#else ++ return dma_fence_default_wait(fence, intr, ++#endif + (timeout == MAX_SCHEDULE_TIMEOUT) ? + msecs_to_jiffies(96) : timeout); + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + static const struct fence_ops nvidia_drm_gem_prime_fence_ops = { ++#else ++static const struct dma_fence_ops nvidia_drm_gem_prime_fence_ops = { ++#endif + .get_driver_name = nvidia_drm_gem_prime_fence_op_get_driver_name, + .get_timeline_name = nvidia_drm_gem_prime_fence_op_get_timeline_name, + .signaled = nvidia_drm_gem_prime_fence_op_signaled, +@@ -285,7 +329,11 @@ static void nvidia_drm_gem_prime_fence_signal + bool force + ) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *fence = nv_gem->fenceContext.softFence; ++#else ++ struct dma_fence *fence = nv_gem->fenceContext.softFence; ++#endif + + WARN_ON(!mutex_is_locked(&nv_dev->dev->struct_mutex)); + +@@ -301,10 +349,18 @@ static void nvidia_drm_gem_prime_fence_signal + + if (force || nv_fence_ready_to_signal(nv_fence)) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_signal(&nv_fence->base); ++#else ++ dma_fence_signal(&nv_fence->base); ++#endif + + nv_gem->fenceContext.softFence = NULL; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_put(&nv_fence->base); ++#else ++ dma_fence_put(&nv_fence->base); ++#endif + + nvKms->disableChannelEvent(nv_dev->pDevice, + nv_gem->fenceContext.cb); +@@ -320,7 +376,11 @@ static void nvidia_drm_gem_prime_fence_signal + + nv_fence = container_of(fence, struct nv_fence, base); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_signal(&nv_fence->base); ++#else ++ dma_fence_signal(&nv_fence->base); ++#endif + } + } + +@@ -513,7 +573,11 @@ int nvidia_drm_gem_prime_fence_init + * fence_context_alloc() cannot fail, so we do not need to check a return + * value. + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + nv_gem->fenceContext.context = fence_context_alloc(1); ++#else ++ nv_gem->fenceContext.context = dma_fence_context_alloc(1); ++#endif + + ret = nvidia_drm_gem_prime_fence_import_semaphore( + nv_dev, nv_gem, p->index, +@@ -670,7 +734,11 @@ int nvidia_drm_gem_prime_fence_attach + nv_fence->nv_gem = nv_gem; + + spin_lock_init(&nv_fence->lock); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_init(&nv_fence->base, &nvidia_drm_gem_prime_fence_ops, ++#else ++ dma_fence_init(&nv_fence->base, &nvidia_drm_gem_prime_fence_ops, ++#endif + &nv_fence->lock, nv_gem->fenceContext.context, + p->sem_thresh); + +@@ -680,7 +748,11 @@ int nvidia_drm_gem_prime_fence_attach + + reservation_object_add_excl_fence(&nv_gem->fenceContext.resv, + &nv_fence->base); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + fence_put(&nv_fence->base); /* Reservation object has reference */ ++#else ++ dma_fence_put(&nv_fence->base); ++#endif + + ret = 0; + +diff --git a/kernel/nvidia-drm/nvidia-drm-gem.h b/kernel/nvidia-drm/nvidia-drm-gem.h +index 4ff45e8..394576b 100644 +--- a/kernel/nvidia-drm/nvidia-drm-gem.h ++++ b/kernel/nvidia-drm/nvidia-drm-gem.h +@@ -29,6 +29,8 @@ + + #include "nvidia-drm-priv.h" + ++#include <linux/version.h> ++ + #include <drm/drmP.h> + #include "nvkms-kapi.h" + +@@ -98,7 +100,11 @@ struct nvidia_drm_gem_object + /* Software signaling structures */ + struct NvKmsKapiChannelEvent *cb; + struct nvidia_drm_gem_prime_soft_fence_event_args *cbArgs; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + struct fence *softFence; /* Fence for software signaling */ ++#else ++ struct dma_fence *softFence; ++#endif + } fenceContext; + #endif + }; +diff --git a/kernel/nvidia-drm/nvidia-drm-priv.h b/kernel/nvidia-drm/nvidia-drm-priv.h +index 1e9b9f9..ae171e7 100644 +--- a/kernel/nvidia-drm/nvidia-drm-priv.h ++++ b/kernel/nvidia-drm/nvidia-drm-priv.h +@@ -25,6 +25,8 @@ + + #include "conftest.h" /* NV_DRM_AVAILABLE */ + ++#include <linux/version.h> ++ + #if defined(NV_DRM_AVAILABLE) + + #include <drm/drmP.h> +@@ -34,7 +36,12 @@ + #endif + + #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) + #include <linux/fence.h> ++#else ++#include <linux/dma-fence.h> ++#endif ++ + #include <linux/reservation.h> + #endif + +diff --git a/kernel/nvidia/nv-pat.c b/kernel/nvidia/nv-pat.c +index df78020..0af7d47 100644 +--- a/kernel/nvidia/nv-pat.c ++++ b/kernel/nvidia/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(nvidia_stack_t *sp) +@@ -255,7 +284,14 @@ int nv_init_pat_support(nvidia_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 + } + } +-- +2.7.4 + diff --git a/nvidia.install b/nvidia.install index 8347405aab26..0641ce9cea93 100644 --- a/nvidia.install +++ b/nvidia.install @@ -1,16 +1,13 @@ post_install() { - EXTRAMODULES='extramodules-4.7-pae' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' + EXTRAMODULES='extramodules-4.10-pae' + depmod $(cat /usr/lib/modules/${EXTRAMODULES}/version) + echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-4.7-pae' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.' + post_install } post_remove() { - EXTRAMODULES='extramodules-4.7-pae' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + post_install } |