6:30 a.m.
commit 5e9af9df47a96ad662e7411258150112cada85b9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Apr 7 11:12:39 2017 +0100
Update to 381.09 beta
kernel_4.10.patch | 382 ------------------------------------------------------
kernel_4.11.patch | 125 ++++++++++++++++++
nvidia-kmod.spec | 7 +-
3 files changed, 130 insertions(+), 384 deletions(-)
---
diff --git a/kernel_4.11.patch b/kernel_4.11.patch
new file mode 100644
index 0000000..09daf25
--- /dev/null
+++ b/kernel_4.11.patch
@@ -0,0 +1,125 @@
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -48,6 +48,8 @@
+ #include <drm/drm_auth.h>
+ #endif
+
++#include <linux/version.h>
++
+ static struct nvidia_drm_device *dev_list = NULL;
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -398,7 +400,11 @@
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nvidia_drm_unload(struct drm_device *dev)
++#else
++static void nvidia_drm_unload(struct drm_device *dev)
++#endif
+ {
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ struct NvKmsKapiDevice *pDevice = NULL;
+@@ -412,7 +418,11 @@
+
+ if (!nvidia_drm_modeset_enabled(dev))
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return 0;
++#else
++ return;
++#endif
+ }
+
+ mutex_lock(&nv_dev->lock);
+@@ -445,7 +455,11 @@
+
+ #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return 0;
++#else
++ return;
++#endif
+ }
+
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+@@ -542,7 +556,9 @@
+ void *data,
+ struct drm_file *file_priv)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
+ struct nvidia_drm_device *nv_dev = dev->dev_private;
++#endif
+ struct drm_nvidia_get_client_capability_params *params = data;
+
+ switch (params->capability)
+
+--- a/kernel/nvidia-drm/nvidia-drm-gem.c
++++ b/kernel/nvidia-drm/nvidia-drm-gem.c
+@@ -31,6 +31,8 @@
+
+ #include "nv-mm.h"
+
++#include <linux/version.h>
++
+ static struct nvidia_drm_gem_object *nvidia_drm_gem_new
+ (
+ struct drm_file *file_priv,
+@@ -511,11 +513,19 @@
+ * Note that nvidia_drm_vma_fault() can be called for different or same
+ * ranges of the same drm_gem_object simultaneously.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nvidia_drm_vma_fault(struct vm_area_struct *vma,
+ struct vm_fault *vmf)
++#else
++static int nvidia_drm_vma_fault(struct vm_fault *vmf)
++#endif
+ {
+ unsigned long address = nv_page_fault_va(vmf);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ struct drm_gem_object *gem = vma->vm_private_data;
++#else
++ struct drm_gem_object *gem = vmf->vma->vm_private_data;
++#endif
+ struct nvidia_drm_gem_object *nv_gem =
+ DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);
+ unsigned long page_offset, pfn;
+@@ -526,7 +536,11 @@
+
+ page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ ret = vm_insert_pfn(vma, address, pfn + page_offset);
++#else
++ ret = vm_insert_pfn(vmf->vma, address, pfn + page_offset);
++#endif
+
+ switch (ret) {
+ case 0:
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c
+@@ -20,6 +20,8 @@
+ * DEALINGS IN THE SOFTWARE.
+ */
+
++#include <linux/version.h>
++
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/err.h>
+@@ -185,7 +187,11 @@
+ module_exit(nv_linux_drm_exit);
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)
++ MODULE_LICENSE("Dual MIT/GPL");
++#else
+ MODULE_LICENSE("MIT");
++#endif
+ #endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index d84fb75..49ec009 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 378.13
+Version: 381.09
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -19,7 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
-Patch2: kernel_4.10.patch
+Patch2: kernel_4.11.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -73,6 +73,9 @@ done
%changelog
+* Fri Apr 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:381.09-1
+- Update to 381.09 beta
+
* Sun Mar 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:378.13-1
- Update to 378.13