nv.patch

diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nv_compiler.h NVIDIA-Linux-x86_64-418.67/kernel/nv_compiler.h
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nv_compiler.h	1969-12-31 19:00:00.000000000 -0500
+++ NVIDIA-Linux-x86_64-418.67/kernel/nv_compiler.h	2019-06-17 14:24:00.256556017 -0400
@@ -0,0 +1 @@
+#define NV_COMPILER "gcc version 9.1.1 20190503 (Red Hat 9.1.1-1) (GCC) "
diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-connector.c
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-connector.c	2019-04-06 04:30:19.000000000 -0400
+++ NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-connector.c	2019-06-17 15:14:28.254981745 -0400
@@ -31,6 +31,7 @@
 #include "nvidia-drm-encoder.h"
 
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_probe_helper.h>
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-drv.c NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-drv.c
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-drv.c	2019-04-06 04:30:19.000000000 -0400
+++ NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-drv.c	2019-06-17 15:14:12.513963952 -0400
@@ -43,6 +43,7 @@
 
 #include <drm/drm_crtc_helper.h>
 
+#include <drm/drm_probe_helper.h>
 #if defined(NV_DRM_DRM_GEM_H_PRESENT)
 #include <drm/drm_gem.h>
 #endif
@@ -55,6 +56,7 @@
 #include <drm/drm_atomic_helper.h>
 #endif
 
+
 static struct nv_drm_device *dev_list = NULL;
 
 #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-encoder.c NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-encoder.c
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-encoder.c	2019-04-06 04:30:19.000000000 -0400
+++ NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-encoder.c	2019-06-17 14:37:36.637478851 -0400
@@ -33,6 +33,7 @@
 
 #include <drm/drm_crtc_helper.h>
 
+#include <drm/drm_probe_helper.h>
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
 
diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c	2019-04-06 04:30:19.000000000 -0400
+++ NVIDIA-Linux-x86_64-418.67/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c	2019-06-17 14:25:45.799675311 -0400
@@ -377,12 +377,12 @@
  */
 
 #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
-static int nv_drm_vma_fault(struct vm_fault *vmf)
+static unsigned int nv_drm_vma_fault(struct vm_fault *vmf)
 {
     return __nv_drm_vma_fault(vmf->vma, vmf);
 }
 #else
-static int nv_drm_vma_fault(struct vm_area_struct *vma,
+static unsigned int nv_drm_vma_fault(struct vm_area_struct *vma,
                                 struct vm_fault *vmf)
 {
     return __nv_drm_vma_fault(vma, vmf);
diff -uNr NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-uvm/uvm8.c NVIDIA-Linux-x86_64-418.67/kernel/nvidia-uvm/uvm8.c
--- NVIDIA-Linux-x86_64-418.67.old/kernel/nvidia-uvm/uvm8.c	2019-04-06 04:30:18.000000000 -0400
+++ NVIDIA-Linux-x86_64-418.67/kernel/nvidia-uvm/uvm8.c	2019-06-17 14:23:50.548545046 -0400
@@ -172,7 +172,7 @@
     return VM_FAULT_SIGBUS;
 }
 
-static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
+static unsigned int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf)
 {
 #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
     return uvm_vm_fault_sigbus(vmf->vma, vmf);
@@ -507,7 +507,7 @@
     }
 }
 
-static int uvm_vm_fault_wrapper(struct vm_fault *vmf)
+static unsigned int uvm_vm_fault_wrapper(struct vm_fault *vmf)
 {
 #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG)
     return uvm_vm_fault(vmf->vma, vmf);