[nvidia-340xx-kmod/f26] Update to 340.106
commit 599e8566ed62e44f767f3bdf156d287e09065254
Author: raveit65 <mate(a)raveit.de>
Date: Thu Jan 18 09:37:04 2018 +0100
Update to 340.106
4.14_kernel-106.patch | 29 +++++++++++++++++++++++++++++
4.14_kernel.patch | 27 ---------------------------
nvidia-340xx-kmod.spec | 9 ++++++---
3 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/4.14_kernel-106.patch b/4.14_kernel-106.patch
new file mode 100644
index 0000000..e5dedb0
--- /dev/null
+++ b/4.14_kernel-106.patch
@@ -0,0 +1,29 @@
+diff -uprN nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c
nvidia-340xx-kmod-340.106/kernel/nv-drm.c
+--- nvidia-340xx-kmod-340.106-orig/kernel/nv-drm.c 2018-01-17 16:49:22.366243000 +0100
++++ nvidia-340xx-kmod-340.106/kernel/nv-drm.c 2018-01-17 16:50:03.685166103 +0100
+@@ -181,8 +181,12 @@ int __init nv_drm_init(
+ {
+ int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+ ret = nv_drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ return ret;
+ }
+
+@@ -191,8 +195,12 @@ void nv_drm_exit(
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+ nv_drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }
+
+ RM_STATUS NV_API_CALL nv_alloc_os_descriptor_handle(
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 59cc418..20f41e5 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.104
+Version: 340.106
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,7 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.11_kernel.patch
-Patch2: 4.14_kernel.patch
+Patch2: 4.14_kernel-106.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jan 17 2018 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1:340.106-1
+- Update to 340.106
+
* Thu Dec 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.104-2
- patch for kernel-4.14