1 --- kernel/nv-linux.h
\r
2 +++ kernel/nv-linux.h
\r
3 @@ -2082,6 +2082,8 @@ static inline NvU64 nv_node_end_pfn(int nid)
\r
4 * 2016 Dec 14:5b56d49fc31dbb0487e14ead790fc81ca9fb2c99
\r
7 +#include <linux/version.h>
\r
9 #if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
\r
10 #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
\r
11 #define NV_GET_USER_PAGES get_user_pages
\r
12 @@ -2129,8 +2131,13 @@ static inline NvU64 nv_node_end_pfn(int nid)
\r
16 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
\r
17 return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
\r
20 + return get_user_pages_remote(tsk, mm, start, nr_pages, flags,
\r
21 + pages, vmas, NULL);
\r
28 @@ -203,6 +203,7 @@ void nv_disable_pat_support(void)
\r
31 #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
\r
32 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
\r
34 nvidia_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
\r
36 @@ -234,6 +235,34 @@ static struct notifier_block nv_hotcpu_nfb = {
\r
37 .notifier_call = nvidia_cpu_callback,
\r
41 +static int nvidia_cpu_online(unsigned int hcpu)
\r
43 + unsigned int cpu = get_cpu();
\r
45 + nv_setup_pat_entries(NULL);
\r
47 + NV_SMP_CALL_FUNCTION(nv_setup_pat_entries, (void *)(long int)hcpu, 1);
\r
54 +static int nvidia_cpu_down_prep(unsigned int hcpu)
\r
56 + unsigned int cpu = get_cpu();
\r
58 + nv_restore_pat_entries(NULL);
\r
60 + NV_SMP_CALL_FUNCTION(nv_restore_pat_entries, (void *)(long int)hcpu, 1);
\r
70 int nv_init_pat_support(nv_stack_t *sp)
\r
71 @@ -255,7 +284,14 @@ int nv_init_pat_support(nv_stack_t *sp)
\r
72 #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
\r
73 if (nv_pat_mode == NV_PAT_MODE_BUILTIN)
\r
75 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
\r
76 if (register_hotcpu_notifier(&nv_hotcpu_nfb) != 0)
\r
78 + if (cpuhp_setup_state(CPUHP_AP_ONLINE_DYN,
\r
79 + "gpu/nvidia:online",
\r
80 + nvidia_cpu_online,
\r
81 + nvidia_cpu_down_prep) != 0)
\r
84 nv_disable_pat_support();
\r
85 nv_printf(NV_DBG_ERRORS,
\r
86 @@ -280,7 +316,11 @@ void nv_teardown_pat_support(void)
\r
88 nv_disable_pat_support();
\r
89 #if defined(NV_ENABLE_PAT_SUPPORT) && defined(NV_ENABLE_HOTPLUG_CPU)
\r
90 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
\r
91 unregister_hotcpu_notifier(&nv_hotcpu_nfb);
\r
93 + cpuhp_remove_state_nocalls(CPUHP_AP_ONLINE_DYN);
\r
98 --- kernel/nv-drm.c 2017-03-31 03:42:21.000000000 +0200
\r
99 +++ kernel/nv-drm.c 2017-04-06 23:53:14.273356795 +0200
\r
104 -static int nv_drm_unload(
\r
105 +static void nv_drm_unload(
\r
106 struct drm_device *dev
\r
111 if (nvl->dev == dev->pdev)
\r
126 static void nv_gem_free(
\r