nvidia rebuild

2020-09-10 19:53:41 +03:00
parent 56810e7116
commit 9d542e84e7
7 changed files with 194 additions and 10 deletions
@@ -33,6 +33,7 @@ def setup():
    #shelltools.system("patch -p1 < kernel-5.6.patch")
    #shelltools.system("patch -p1 < unfuck-340.108-build-fix.patch")
    shelltools.system("patch -p1 < kernel-5.7.patch")
+    shelltools.system("patch -p1 < kernel-5.8.patch")
    

    # Our libc is TLS enabled so use TLS library
@@ -0,0 +1,67 @@
+--- a/kernel/nvidia-modules-common.mk
+++ b/kernel/nvidia-modules-common.mk
+@@ -222,6 +222,7 @@
+ define BUILD_MODULE_RULE
+  $(1): build-sanity-checks $(3)
+ 	@echo "NVIDIA: calling KBUILD..."; \
+	touch .nv-kernel.o.cmd; \
+ 	$$(MAKE) "CC=$$(CC)" NV_MODULE_SUFFIX=$$(strip $(2)) $$(KBUILD_PARAMS) modules; \
+ 	echo "NVIDIA: left KBUILD."; \
+ 	if ! [ -f $(1) ]; then \
+--- a/kernel/nv-linux.h	2020-08-08 03:48:46.894783237 +0300
+++ b/kernel/nv-linux.h	2020-08-08 15:43:05.252047541 +0300
+@@ -669,11 +669,19 @@
+ #  define KM_FREE_RECORD(a,b,c)
+ #endif
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+#define NV_VMALLOC(ptr, size)                     \
+    {                                             \
+        (ptr) = __vmalloc(size, GFP_KERNEL);      \
+        VM_ALLOC_RECORD(ptr, size, "vm_vmalloc"); \
+    }
+#else
+ #define NV_VMALLOC(ptr, size)                               \
+     {                                                       \
+         (ptr) = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);   \
+         VM_ALLOC_RECORD(ptr, size, "vm_vmalloc");           \
+     }
+#endif
+ 
+ #define NV_VFREE(ptr, size)                         \
+     {                                               \
+--- a/kernel/os-mlock.c	2020-04-16 15:37:41.000000000 +0300
+++ b/kernel/os-mlock.c	2020-08-08 15:47:44.793311179 +0300
+@@ -44,11 +44,19 @@
+         return rmStatus;
+     }
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+    down_read(&mm->mmap_lock);
+    ret = NV_GET_USER_PAGES((unsigned long)address,
+                            page_count, write, force, user_pages, NULL);
+    up_read(&mm->mmap_lock);
+    pinned = ret;
+#else
+     down_read(&mm->mmap_sem);
+     ret = NV_GET_USER_PAGES((unsigned long)address,
+                             page_count, write, force, user_pages, NULL);
+     up_read(&mm->mmap_sem);
+     pinned = ret;
+#endif
+ 
+     if (ret < 0)
+     {
+--- a/kernel/uvm/nvidia_uvm_lite_api.c	2020-04-16 15:37:41.000000000 +0300
+++ b/kernel/uvm/nvidia_uvm_lite_api.c	2020-08-08 15:28:40.110186418 +0300
+@@ -30,6 +30,10 @@
+ #include "uvm_gpu_ops_tests.h"
+ #endif
+ 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+#define mmap_sem mmap_lock
+#endif
+
+ //
+ // nvidia_uvm_lite_api.c
+ //
@@ -17,12 +17,11 @@
            <AdditionalFile target="unfuck-340.108-build-fix.patch">unfuck-340.108-build-fix.patch</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="unfuck-340.108-build-fix.patch">unfuck-340.108-build-fix.patch</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="kernel-5.5.patch">NVIDIA-Linux-x86_64-340.108-kernel-5.5.patch</AdditionalFile>
-            <AdditionalFile owner="root" permission="0644" target="kernel-5.6.patch">NVIDIA-Linux-x86_64-340.108-kernel-5.6.patch</AdditionalFile>
            <AdditionalFile owner="root" permission="0644" target="kernel-5.7.patch">NVIDIA-Linux-x86_64-340.108-kernel-5.7.patch</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="kernel-5.8.patch">NVIDIA-Linux-x86_64-340.108-kernel-5.8.patch</AdditionalFile>
        </AdditionalFiles>
        <BuildDependencies>
-            <Dependency version="5.7.14">kernel-module-headers</Dependency>
+            <Dependency version="5.8.8">kernel-module-headers</Dependency>
        </BuildDependencies>
    </Source>

@@ -31,7 +30,7 @@
        <IsA>driver</IsA>
        <Summary>Kernel module for NVIDIA driver 340.xx releases</Summary>
        <RuntimeDependencies>
-            <Dependency version="5.7.14">kernel</Dependency>
+            <Dependency version="5.8.8">kernel</Dependency>
        </RuntimeDependencies>
        <Files>
            <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -157,6 +156,13 @@
    </Package>

    <History>
+        <Update release="34">
+            <Date>2020-09-10</Date>
+            <Version>340.108</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="33">
            <Date>2020-07-05</Date>
            <Version>340.108</Version>