Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module-nvidia340: rebuild for kernel 4.6.3

Browse Source
This commit is contained in:
suvari
2016-07-17 17:34:15 +03:00
parent aa6c95c2e9
commit d6c18d54a9
3 changed files with 174 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-nvidia340/actions.py
+11 -7
View File
@@ -24,17 +24,21 @@ xorglibdir= "%s/xorg" % libdir
def setup():
shelltools.system("sh NVIDIA-Linux-%s-%s.run -x --target tmp"
% (arch, get.srcVERSION()))
shelltools.move("tmp/*", ".")
# Our libc is TLS enabled so use TLS library
shelltools.unlink("*-tls.so*")
shelltools.move("tls/*", ".")
# xorg-server provides libwfb.so
shelltools.unlink("libnvidia-wfb.so.*")
shelltools.echo("ld.so.conf", nvlibdir)
shelltools.echo("XvMCConfig", "%s/libXvMCNVIDIA.so" % nvlibdir)
shelltools.system("patch -p1 < linux-4.6.patch")
def build():
# We don't need kernel module for emul32 build
@@ -42,13 +46,13 @@ def build():
return
shelltools.export("SYSSRC", "/lib/modules/%s/build" % KDIR)
shelltools.cd("kernel")
autotools.make("module")
shelltools.cd("uvm")
autotools.make("module")
def install():
@@ -56,10 +60,10 @@ def install():
if not get.buildTYPE() == 'emul32':
# Kernel driver
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
"kernel/nvidia.ko")
"kernel/nvidia.ko")
pisitools.insinto("/lib/modules/%s/extra/nvidia" % KDIR,
"kernel/uvm/nvidia-uvm.ko")
"kernel/uvm/nvidia-uvm.ko")
# Command line tools and their man pages
pisitools.dobin("nvidia-smi")
@@ -77,7 +81,7 @@ def install():
pisitools.dolib("libOpenCL.so.1.0.0", libdir)
pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir)
pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir)
pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir)
pisitools.dosym("libnvidia-opencl.so.1", "%s/libnvidia-opencl.so" % libdir)
kernel/drivers/module-nvidia340/files/linux-4.6.patch
+150
View File
@@ -0,0 +1,150 @@
--- /dev/null
+++ b/kernel/nv-mm.h
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ Copyright (c) 2016 NVIDIA Corporation
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+*******************************************************************************/
+#ifndef __NV_MM_H__
+#define __NV_MM_H__
+
+/* get_user_pages_remote() was added by:
+ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ *
+ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653)
+ * deprecated the 8-argument version of get_user_pages for the
+ * non-remote case (calling get_user_pages with current and current->mm).
+ *
+ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument
+ * version that uses something other than current and current->mm. Use
+ * NV_GET_USER_PAGES if you are refering to current and current->mm.
+ *
+* Note that get_user_pages_remote() requires the caller to hold a reference on
+* the task_struct (if non-NULL) and the mm_struct. This will always be true
+* when using current and current->mm. If the kernel passes the driver a vma
+* via driver callback, the kernel holds a reference on vma->vm_mm over that
+* callback.
+ */
+
+#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT)
+ #define NV_GET_USER_PAGES get_user_pages
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote
+#else
+ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \
+ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas)
+
+ #define NV_GET_USER_PAGES_REMOTE get_user_pages
+#endif
+
+
+#endif // __NV_MM_H__
--- a/kernel/os-mlock.c
+++ b/kernel/os-mlock.c
@@ -13,6 +13,7 @@
#include "os-interface.h"
#include "nv-linux.h"
+#include "nv-mm.h"
RM_STATUS NV_API_CALL os_lock_user_pages(
void *address,
@@ -45,7 +46,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
}
down_read(&mm->mmap_sem);
- ret = get_user_pages(current, mm, (unsigned long)address,
+ ret = NV_GET_USER_PAGES((unsigned long)address,
page_count, write, force, user_pages, NULL);
up_read(&mm->mmap_sem);
pinned = ret;
@@ -59,7 +59,7 @@ RM_STATUS NV_API_CALL os_lock_user_pages(
else if (pinned < page_count)
{
for (i = 0; i < pinned; i++)
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
os_free_mem(user_pages);
return RM_ERR_INVALID_ADDRESS;
}
@@ -86,7 +86,7 @@ RM_STATUS NV_API_CALL os_unlock_user_pages(
{
if (write)
set_page_dirty_lock(user_pages[i]);
- page_cache_release(user_pages[i]);
+ put_page(user_pages[i]);
}
os_free_mem(user_pages);
diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh
index d01488b..308ea8a 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -1669,6 +1669,23 @@ compile_test() {
compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions"
;;
+
+ get_user_pages_remote)
+ #
+ # Determine if the function get_user_pages_remote() is
+ # present.
+ #
+ # get_user_pages_remote() was added by:
+ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7
+ #
+ CODE="
+ #include <linux/mm.h>
+ int conftest_get_user_pages_remote(void) {
+ get_user_pages_remote();
+ }"
+
+ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions"
+ ;;
esac
}
diff --git a/kernel/Makefile.orig b/kernel/Makefile
index 438d487..c52a36c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -139,7 +139,8 @@ COMPILE_TESTS = \
drm_pci_set_busid \
write_cr4 \
for_each_online_node \
- node_end_pfn
+ node_end_pfn \
+ get_user_pages_remote
#
# CFLAGS dependent on the type of builds (e.g. single/muliple module, debug)
diff --git a/kernel/uvm/nvidia_uvm_lite.c.orig b/kernel/uvm/nvidia_uvm_lite.c
index 442a0a8..695f092 100644
--- a/kernel/uvm/nvidia_uvm_lite.c
+++ b/kernel/uvm/nvidia_uvm_lite.c
@@ -785,7 +785,7 @@ int _fault_common(struct vm_area_struct *vma, unsigned long vaddr,
// a reference so that the fault handling logic is correct:
//
get_page(pTracking->uvmPage);
- retValue = VM_FAULT_MINOR;
+ retValue = 0;
}
pRecord->isMapped = NV_TRUE;
kernel/drivers/module-nvidia340/pspec.xml
+13 -5
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
@@ -14,8 +13,11 @@
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="082e5218059b565f652236a69e61d8426696098c" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/340.96/NVIDIA-Linux-x86-340.96.run</Archive>
<Archive sha1sum="1cfabc6116192aa5ba46293aa842eb1a5addeeed" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/340.96/NVIDIA-Linux-x86_64-340.96.run</Archive>
<AdditionalFiles>
<AdditionalFile target="linux-4.6.patch">linux-4.6.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="4.4.8">kernel-module-headers</Dependency>
<Dependency version="4.6.3">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
@@ -24,7 +26,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for NVIDIA driver 340.xx releases</Summary>
<RuntimeDependencies>
<Dependency version="4.4.8">kernel</Dependency>
<Dependency version="4.6.3">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
@@ -71,7 +73,6 @@
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libvdpau-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>zlib-32bit</Dependency>
@@ -96,6 +97,13 @@
</Package>
<History>
<Update release="3">
<Date>2016-07-17</Date>
<Version>340.96</Version>
<Comment>Rebuild for new kernel</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>340.96</Version>
@@ -111,4 +119,4 @@
<Email>ertugrulerata@gmail.com</Email>
</Update>
</History>
</PISI>
</PISI>