mirror of
https://github.com/archlinux/aur.git
synced 2026-03-14 23:16:48 +01:00
Add kernel-6.3.patch from Ike Devolder
This commit is contained in:
vnctdj
parent
785d24c321
commit
cdd51e0d80
3 changed files with 101 additions and 4 deletions
4
.SRCINFO
4
.SRCINFO
|
|
@ -1,6 +1,6 @@
|
|||
pkgbase = nvidia-390xx-utils
|
||||
pkgver = 390.157
|
||||
pkgrel = 3
|
||||
pkgrel = 4
|
||||
url = https://www.nvidia.com/
|
||||
arch = x86_64
|
||||
license = custom
|
||||
|
|
@ -10,12 +10,14 @@ pkgbase = nvidia-390xx-utils
|
|||
source = nvidia-390xx.rules
|
||||
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run
|
||||
source = kernel-6.2.patch
|
||||
source = kernel-6.3.patch
|
||||
source = kernel-4.16+-memory-encryption.patch
|
||||
b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
|
||||
b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
|
||||
b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534
|
||||
b2sums = 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b
|
||||
b2sums = dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2
|
||||
b2sums = 6c9a4cf14d5987b688da1aade433a8e96dc530264aac8ec6016a2118ca6fef18f4e4b8519c506d81848a1a809ec52d8a1fc89385be15f7c202342a4cdcf082a7
|
||||
b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
|
||||
|
||||
pkgname = nvidia-390xx-utils
|
||||
|
|
|
|||
12
PKGBUILD
12
PKGBUILD
|
|
@ -1,5 +1,5 @@
|
|||
# Maintainer: Jonathon Fernyhough <jonathon+m2x+dev>
|
||||
# Contributor: vnctdj
|
||||
# Maintainer: vnctdj
|
||||
# Contributor: Jonathon Fernyhough (RIP) <jonathon+m2x+dev>
|
||||
# Contributor: Alonso Rodriguez <alonsorodi20 (at) gmail (dot) com>
|
||||
# Contributor: Sven-Hendrik Haase <svenstaro@gmail.com>
|
||||
# Contributor: Thomas Baechler <thomas@archlinux.org>
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
pkgbase=nvidia-390xx-utils
|
||||
pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
|
||||
pkgver=390.157
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('x86_64')
|
||||
url="https://www.nvidia.com/"
|
||||
license=('custom')
|
||||
|
|
@ -19,12 +19,14 @@ source=('nvidia-drm-outputclass.conf'
|
|||
'nvidia-390xx.rules'
|
||||
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
|
||||
kernel-6.2.patch
|
||||
kernel-6.3.patch
|
||||
kernel-4.16+-memory-encryption.patch)
|
||||
b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
|
||||
'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
|
||||
'67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534'
|
||||
'44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b'
|
||||
'dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2'
|
||||
'6c9a4cf14d5987b688da1aade433a8e96dc530264aac8ec6016a2118ca6fef18f4e4b8519c506d81848a1a809ec52d8a1fc89385be15f7c202342a4cdcf082a7'
|
||||
'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
|
||||
|
||||
create_links() {
|
||||
|
|
@ -52,6 +54,10 @@ prepare() {
|
|||
patch -Np1 -i ../kernel-6.2.patch
|
||||
|
||||
cd kernel
|
||||
|
||||
# From Ike Devolder
|
||||
patch -Np1 -i ../kernel-6.3.patch
|
||||
|
||||
sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
|
||||
sed -i 's/__JOBS/`nproc`/' dkms.conf
|
||||
sed -i 's/__DKMS_MODULES//' dkms.conf
|
||||
|
|
|
|||
89
kernel-6.3.patch
Normal file
89
kernel-6.3.patch
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
|
||||
index 2c4cb7b..f68fcf2 100644
|
||||
--- a/common/inc/nv-linux.h
|
||||
+++ b/common/inc/nv-linux.h
|
||||
@@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47)
|
||||
#include <linux/backlight.h>
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
|
||||
+// Rel. commit "mm: introduce vma->vm_flags wrapper functions" (Suren Baghdasaryan, 26 Jan 2023)
|
||||
+static inline void vm_flags_set(struct vm_area_struct *vma, vm_flags_t flags)
|
||||
+{
|
||||
+ vma->vm_flags |= flags;
|
||||
+}
|
||||
+
|
||||
+static inline void vm_flags_clear(struct vm_area_struct *vma, vm_flags_t flags)
|
||||
+{
|
||||
+ vma->vm_flags &= ~flags;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif /* _NV_LINUX_H_ */
|
||||
diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
|
||||
index 725164a..c35e0ee 100644
|
||||
--- a/nvidia-drm/nvidia-drm-fb.c
|
||||
+++ b/nvidia-drm/nvidia-drm-fb.c
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "nvidia-drm-fb.h"
|
||||
#include "nvidia-drm-utils.h"
|
||||
#include "nvidia-drm-gem.h"
|
||||
+#include "nvidia-drm-helper.h"
|
||||
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
|
||||
diff --git a/nvidia-uvm/uvm8.c b/nvidia-uvm/uvm8.c
|
||||
index 11cb373..49e1047 100644
|
||||
--- a/nvidia-uvm/uvm8.c
|
||||
+++ b/nvidia-uvm/uvm8.c
|
||||
@@ -658,7 +658,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||
// Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that
|
||||
// so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK
|
||||
// with VM_IO, but that causes other mapping issues.
|
||||
- vma->vm_flags |= VM_MIXEDMAP | VM_DONTEXPAND;
|
||||
+ vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
|
||||
|
||||
vma->vm_ops = &uvm_vm_ops_managed;
|
||||
|
||||
diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c
|
||||
index 0b0a6f2..da891ff 100644
|
||||
--- a/nvidia/nv-mmap.c
|
||||
+++ b/nvidia/nv-mmap.c
|
||||
@@ -447,7 +447,7 @@ int nvidia_mmap_helper(
|
||||
addr = mmap_start;
|
||||
|
||||
// Needed for the linux kernel for mapping compound pages
|
||||
- vma->vm_flags |= VM_MIXEDMAP;
|
||||
+ vm_flags_set(vma, VM_MIXEDMAP);
|
||||
|
||||
for (j = 0; j < pages; j++)
|
||||
{
|
||||
@@ -471,7 +471,7 @@ int nvidia_mmap_helper(
|
||||
}
|
||||
}
|
||||
|
||||
- vma->vm_flags |= VM_IO;
|
||||
+ vm_flags_set(vma, VM_IO);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -533,15 +533,15 @@ int nvidia_mmap_helper(
|
||||
|
||||
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
||||
|
||||
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
- vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP);
|
||||
+ vm_flags_set(vma, VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
+ vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
|
||||
}
|
||||
|
||||
if ((prot & NV_PROTECT_WRITEABLE) == 0)
|
||||
{
|
||||
vma->vm_page_prot = NV_PGPROT_READ_ONLY(vma->vm_page_prot);
|
||||
- vma->vm_flags &= ~VM_WRITE;
|
||||
- vma->vm_flags &= ~VM_MAYWRITE;
|
||||
+ vm_flags_clear(vma, VM_WRITE);
|
||||
+ vm_flags_clear(vma, VM_MAYWRITE);
|
||||
}
|
||||
|
||||
vma->vm_ops = &nv_vm_ops;
|
||||
Loading…
Add table
Reference in a new issue