Merge pull request #5752 from Rmys/master

nvidia304:rebuild

kernel/drivers/module-nvidia304/actions.py

@@ -31,7 +31,7 @@ def setup():
                       % (arch, get.srcVERSION()))
     shelltools.move("tmp/*", ".")
 
-    #shelltools.system("patch -p1 < linux-4.6.patch")
+    shelltools.system("patch -p1 < kernel-4.14.patch")
     #shelltools.system("patch -p0 < nv-drm.patch")
 
     # Our libc is TLS enabled so use TLS library

kernel/drivers/module-nvidia304/files/kernel-4.14.patch

@@ -0,0 +1,35 @@
+--- NVIDIA-Linux-x86_64-304.137/kernel/nv-drm.c.orig	2017-09-14 23:51:09.000000000 +0300
++++ NVIDIA-Linux-x86_64-304.137/kernel/nv-drm.c	2017-11-13 16:24:05.604118167 +0200
+@@ -14,6 +14,8 @@
+ #include "os-interface.h"
+ #include "nv-linux.h"
+ 
++#include <linux/version.h>
++
+ #if defined(NV_DRM_AVAILABLE)
+ 
+ #include <drm/drmP.h>
+@@ -121,8 +123,12 @@ int __init nv_drm_init(
+ {
+     int ret = 0;
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver);
++#else
+     ret = drm_pci_init(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+     return ret;
+ }
+ 
+@@ -131,6 +137,10 @@ void nv_drm_exit(
+ )
+ {
+ #if defined(NV_DRM_AVAILABLE)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
++    drm_legacy_pci_exit(&nv_drm_driver, pci_driver);
++#else
+     drm_pci_exit(&nv_drm_driver, pci_driver);
+ #endif
++#endif
+ }

kernel/drivers/module-nvidia304/pspec.xml

@@ -15,7 +15,7 @@
         <Archive sha1sum="5b110db57f617aadacb86aa4974847c2954aa1b3" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run</Archive>
         <Archive sha1sum="8e4bd0aee5f5667aa00c38b8ecf520494d0a9d02" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run</Archive>
         <AdditionalFiles>
-<!--             <AdditionalFile target="linux-4.6.patch">linux-4.6.patch</AdditionalFile> -->
+            <AdditionalFile target="kernel-4.14.patch">kernel-4.14.patch</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency version="4.14.61">kernel-module-headers</Dependency>
@@ -67,7 +67,7 @@
 
     <History>
         <Update release="20">
-            <Date>2018-09-01</Date>
+            <Date>2018-09-16</Date>
             <Version>304.137</Version>
             <Comment>Rebuild for new kernel.</Comment>
             <Name>Mustafa Cinasal</Name>