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

Merge pull request #4919 from Rmys/master

Browse Source 
nvidia-340
This commit is contained in:
Rmys
2018-07-13 15:16:32 +03:00
committed by GitHub
parent 1c1215299f 320704eb02
commit be5f8c7c82
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-nvidia340/actions.py
+1 -1
View File
@@ -38,7 +38,7 @@ def setup():
shelltools.echo("ld.so.conf", nvlibdir)
shelltools.echo("XvMCConfig", "%s/libXvMCNVIDIA.so" % nvlibdir)
#shelltools.system("patch -p1 < linux-4.6.patch")
shelltools.system("patch -p0 < kernel-4.11.patch")
def build():
# We don't need kernel module for emul32 build
kernel/drivers/module-nvidia340/files/kernel-4.11.patch
+38
View File
@@ -0,0 +1,38 @@
--- kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:50:46.334075042 +0200
+++ kernel/uvm/nvidia_uvm_lite.c 2017-09-27 13:56:06.358041280 +0200
@@ -818,7 +818,11 @@
}
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#else
+int _fault(struct vm_fault *vmf)
+#endif
{
#if defined(NV_VM_FAULT_HAS_ADDRESS)
unsigned long vaddr = vmf->address;
@@ -828,7 +832,11 @@
struct page *page = NULL;
int retval;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
retval = _fault_common(vma, vaddr, &page, vmf->flags);
+#else
+ retval = _fault_common(NULL, vaddr, &page, vmf->flags);
+#endif
vmf->page = page;
@@ -866,7 +874,11 @@
// it's dealing with anonymous mapping (see handle_pte_fault).
//
#if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#else
+int _sigbus_fault(struct vm_fault *vmf)
+#endif
{
vmf->page = NULL;
return VM_FAULT_SIGBUS;
kernel/drivers/module-nvidia340/pspec.xml
+4 -4
View File
@@ -11,10 +11,10 @@
<License>NVIDIA</License>
<Summary>NVIDIA drivers for GeForce 6xxx and newer GPUs</Summary>
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="a021398eb8ed55cfc5c4dedaa2b0d96e23fc6cb7" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/340.106/NVIDIA-Linux-x86-340.106.run</Archive>
<Archive sha1sum="765421ede2abf475b5469f56fe1cd399c5ea4464" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/340.106/NVIDIA-Linux-x86_64-340.106.run</Archive>
<Archive sha1sum="e3897bc262e7ab58cda31c1139c3dc62af528113" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run</Archive>
<Archive sha1sum="de4d309e52ab489e412fe6de000bb92ca27b6f31" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run</Archive>
<AdditionalFiles>
<!-- <AdditionalFile target="linux-4.6.patch">linux-4.6.patch</AdditionalFile> -->
<AdditionalFile target="kernel-4.11.patch">kernel-4.11.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="4.14.55">kernel-module-headers</Dependency>
@@ -99,7 +99,7 @@
<History>
<Update release="19">
<Date>2018-07-13</Date>
<Version>340.106</Version>
<Version>340.107</Version>
<Comment>Rebuild for new kernel.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>