]> git.pld-linux.org Git - packages/xorg-driver-video-nvidia-legacy-340xx.git/blame - kernel-4.14.patch
- fix kernel 4.14 patch
[packages/xorg-driver-video-nvidia-legacy-340xx.git] / kernel-4.14.patch
CommitLineData
370863e5
JR
1From 5c9e8a994fe8529388ab159e0aa371c75bc3d17b Mon Sep 17 00:00:00 2001
2From: MilhouseVH <milhouseVH.github@nmacleod.com>
3Date: Thu, 21 Sep 2017 04:22:12 +0100
4Subject: [PATCH] drm/pci: drm_pci_init/exit now deprecated
5
6As per: https://github.com/torvalds/linux/commit/10631d724deff712343d96dd3017cd323349f761
7
8Use legacy variant, as pci_[un]register_driver currently fails.
9---
10 kernel/nv-drm.c | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
14index 2aa7cc8..23df996 100644
15--- a/kernel/nv-drm.c
16+++ b/kernel/nv-drm.c
c8616858 17@@ -173,7 +173,11 @@ int __init nv_drm_init(
370863e5
JR
18 {
19 int ret = 0;
20 #if defined(NV_DRM_AVAILABLE)
c8616858
JR
21+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
22 ret = drm_pci_init(&nv_drm_driver, pci_driver);
23+#else
370863e5 24+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
c8616858 25+#endif
370863e5
JR
26 #endif
27 return ret;
28 }
c8616858 29@@ -183,7 +183,11 @@ void nv_drm_exit(
370863e5
JR
30 )
31 {
32 #if defined(NV_DRM_AVAILABLE)
c8616858
JR
33+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
34 drm_pci_exit(&nv_drm_driver, pci_driver);
35+#else
370863e5 36+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
c8616858 37+#endif
370863e5
JR
38 #endif
39 }
40
41--
422.7.4
43
This page took 0.037018 seconds and 4 git commands to generate.