commit 5e54dbe560d705fc721d2fc908cfce3ea13f7434 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat May 6 00:21:51 2017 +0100 Update to 375.66 release kernel_4.11.patch | 103 +----------------------------------------------------- nvidia-kmod.spec | 7 ++-- 2 files changed, 6 insertions(+), 104 deletions(-) --- diff --git a/kernel_4.11.patch b/kernel_4.11.patch index 09daf25..dd6e508 100644 --- a/kernel_4.11.patch +++ b/kernel_4.11.patch @@ -1,104 +1,3 @@ ---- 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 @@ @@ -110,7 +9,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/err.h> -@@ -185,7 +187,11 @@ +@@ -196,7 +198,11 @@ module_exit(nv_linux_drm_exit); #if defined(MODULE_LICENSE) diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec index 49ec009..fbdc943 100644 --- a/nvidia-kmod.spec +++ b/nvidia-kmod.spec @@ -7,8 +7,8 @@ %global debug_package %{nil} Name: nvidia-kmod -Epoch: 1 -Version: 381.09 +Epoch: 2 +Version: 375.66 # Taken over by kmodtool Release: 1%{?dist} Summary: NVIDIA display driver kernel module @@ -73,6 +73,9 @@ done %changelog +* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2:375.66-1 +- Update to 375.66 release + * Fri Apr 07 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:381.09-1 - Update to 381.09 beta