[patch] nvidia-drivers patch for API changes

fix-invalid-pointer.patch (text/plain), 1.66 KB, created by Nicolas Porcel on 2017-05-10 21:06:27 UTC

Index: work/kernel/nvidia-drm/nvidia-drm-drv.c
===================================================================
--- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c
+++ work/kernel/nvidia-drm/nvidia-drm-drv.c
@@ -398,7 +398,7 @@ static int nvidia_drm_load(struct drm_de
     return 0;
 }
 
-static int nvidia_drm_unload(struct drm_device *dev)
+static void nvidia_drm_unload(struct drm_device *dev)
 {
 #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
     struct NvKmsKapiDevice *pDevice = NULL;
@@ -412,7 +412,7 @@ static int nvidia_drm_unload(struct drm_
 
     if (!nvidia_drm_modeset_enabled(dev))
     {
-        return 0;
+        return;
     }
 
     mutex_lock(&nv_dev->lock);
@@ -445,7 +445,7 @@ static int nvidia_drm_unload(struct drm_
 
 #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
 
-    return 0;
+    return;
 }
 
 #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
Index: work/kernel/nvidia-drm/nvidia-drm-gem.c
===================================================================
--- work.orig/kernel/nvidia-drm/nvidia-drm-gem.c
+++ work/kernel/nvidia-drm/nvidia-drm-gem.c
@@ -511,10 +511,10 @@ static void nvidia_drm_vma_open(struct v
  * Note that nvidia_drm_vma_fault() can be called for different or same
  * ranges of the same drm_gem_object simultaneously.
  */
-static int nvidia_drm_vma_fault(struct vm_area_struct *vma,
-                                struct vm_fault *vmf)
+static int nvidia_drm_vma_fault(struct vm_fault *vmf)
 {
     unsigned long address = nv_page_fault_va(vmf);
+    struct vm_area_struct *vma = vmf->vma;
     struct drm_gem_object *gem = vma->vm_private_data;
     struct nvidia_drm_gem_object *nv_gem =
                     DRM_GEM_OBJECT_TO_NV_GEM_OBJECT(gem);