[packages/xorg-driver-video-nvidia-legacy-304xx] - fix kernel 4.14 patch - rel 2
baggins
baggins at pld-linux.org
Sat Nov 18 15:27:16 CET 2017
commit 2d5ac608923da746e21fb54fa8ea0bb1f124be61
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Nov 18 15:26:48 2017 +0100
- fix kernel 4.14 patch
- rel 2
kernel-4.14.patch | 14 ++++++++++----
xorg-driver-video-nvidia-legacy-304xx.spec | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/xorg-driver-video-nvidia-legacy-304xx.spec b/xorg-driver-video-nvidia-legacy-304xx.spec
index 2cec35e..b3bbee1 100644
--- a/xorg-driver-video-nvidia-legacy-304xx.spec
+++ b/xorg-driver-video-nvidia-legacy-304xx.spec
@@ -25,7 +25,7 @@ exit 1
%define no_install_post_check_so 1
-%define rel 1
+%define rel 2
%define mname nvidia-legacy-304xx
%define pname xorg-driver-video-%{mname}
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
diff --git a/kernel-4.14.patch b/kernel-4.14.patch
index 9aae52c..02f2730 100644
--- a/kernel-4.14.patch
+++ b/kernel-4.14.patch
@@ -14,21 +14,27 @@ diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
index 2aa7cc8..23df996 100644
--- a/kernel/nv-drm.c
+++ b/kernel/nv-drm.c
-@@ -173,7 +173,7 @@ int __init nv_drm_init(
+@@ -173,7 +173,11 @@ int __init nv_drm_init(
{
int ret = 0;
#if defined(NV_DRM_AVAILABLE)
-- ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ ret = drm_pci_init(&nv_drm_driver, pci_driver);
++#else
+ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#endif
#endif
return ret;
}
-@@ -183,7 +183,7 @@ void nv_drm_exit(
+@@ -183,7 +183,11 @@ void nv_drm_exit(
)
{
#if defined(NV_DRM_AVAILABLE)
-- drm_pci_exit(&nv_drm_driver, pci_driver);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ drm_pci_exit(&nv_drm_driver, pci_driver);
++#else
+ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#endif
#endif
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia-legacy-304xx.git/commitdiff/2d5ac608923da746e21fb54fa8ea0bb1f124be61
More information about the pld-cvs-commit
mailing list