NVIDIA-Linux-x86_64-396.54 linux-next-f8dcd02792146c5047419ff4c856651acd04f7c6.patch

gistfile1.txt

diff -ur NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-connector.c NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-connector.c
--- NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-15 09:44:34.000000000 +0200
+++ NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-22 16:10:28.863761774 +0200
@@ -226,7 +226,7 @@
 
 
     if (nv_connector->edid != NULL) {
-        drm_mode_connector_update_edid_property(
+        drm_connector_update_edid_property(
             connector, nv_connector->edid);
     }
 
Only in NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm: nvidia-drm-drv.c.rej
diff -ur NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-encoder.c NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-encoder.c
--- NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-15 09:44:34.000000000 +0200
+++ NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 16:10:36.294761332 +0200
@@ -216,7 +216,7 @@
 
     /* Attach encoder and connector */
 
-    ret = drm_mode_connector_attach_encoder(connector, encoder);
+    ret = drm_connector_attach_encoder(connector, encoder);
 
     if (ret != 0) {
         NV_DRM_DEV_LOG_ERR(
diff -ur NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c
--- NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c	2018-08-15 09:44:34.000000000 +0200
+++ NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c	2018-09-13 16:40:04.251982663 +0200
@@ -278,14 +278,14 @@
     struct nv_drm_gem_nvkms_memory *nv_nvkms_memory = to_nv_nvkms_memory(
         to_nv_gem_object(gem));
     unsigned long page_offset, pfn;
-    int ret = -EINVAL;
+    vm_fault_t ret = -EINVAL;
 
     pfn = (unsigned long)(uintptr_t)nv_nvkms_memory->pPhysicalAddress;
     pfn >>= PAGE_SHIFT;
 
     page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
 
-    ret = vm_insert_pfn(vma, address, pfn + page_offset);
+    ret = vmf_insert_pfn(vma, address, pfn + page_offset);
 
     switch (ret) {
         case 0:
diff -ur NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-helper.c NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-helper.c
--- NVIDIA-Linux-x86_64-396.54/kernel/nvidia-drm/nvidia-drm-helper.c	2018-08-15 09:44:34.000000000 +0200
+++ NVIDIA-Linux-x86_64-396.54.patched/kernel/nvidia-drm/nvidia-drm-helper.c	2018-09-13 16:41:03.665979122 +0200
@@ -73,7 +73,8 @@
                                     struct drm_display_mode *mode)
 {
 #if defined(NV_DRM_ATOMIC_SET_MODE_FOR_CRTC)
-    return drm_atomic_set_mode_for_crtc(state, mode);
+    //return drm_atomic_set_mode_for_crtc(state, mode);
+    return 0;
 #else
     /* Early return for no change. */
     if (mode && memcmp(&state->mode, mode, sizeof(*mode)) == 0)