[PR PATCH] nvidia470: add patch for linux 6.3

[PR PATCH] nvidia470: add patch for linux 6.3

[abenson]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages nvidia470_linux6.3
https://github.com/void-linux/void-packages/pull/44041

nvidia470: add patch for linux 6.3

#### Testing the changes
- I tested the changes in this PR: **NO** :(

#### Local build testing
- I built this PR locally for my native architecture, x86_64


A patch file from https://github.com/void-linux/void-packages/pull/44041.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia470_linux6.3-44041.patch --]
[-- Type: text/x-diff, Size: 5114 bytes --]

From fd8d3b4d2667a904f79401c77e3183a85ae835b5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 23 May 2023 06:16:11 -0500
Subject: [PATCH] nvidia470: add patch for linux 6.3

---
 srcpkgs/nvidia470/patches/linux-6.3.patch | 117 ++++++++++++++++++++++
 srcpkgs/nvidia470/template                |   2 +-
 2 files changed, 118 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvidia470/patches/linux-6.3.patch

diff --git a/srcpkgs/nvidia470/patches/linux-6.3.patch b/srcpkgs/nvidia470/patches/linux-6.3.patch
new file mode 100644
index 000000000000..11d29cb19853
--- /dev/null
+++ b/srcpkgs/nvidia470/patches/linux-6.3.patch
@@ -0,0 +1,117 @@
+From a77f2da778f4a62695a6c7d26bba674d59ad9170 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sat, 25 Feb 2023 10:57:09 +0000
+Subject: [PATCH] Tentative fix for NVIDIA 470.161.03 driver for Linux 6.3-rc1
+
+---
+ common/inc/nv-linux.h                   | 13 +++++++++++++
+ nvidia-drm/nvidia-drm-gem-user-memory.c |  7 ++++---
+ nvidia-uvm/uvm.c                        |  2 +-
+ nvidia/nv-mmap.c                        | 12 ++++++------
+ 4 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h
+index f8df9e3..5b22cf1 100644
+--- a/common/inc/nv-linux.h
++++ b/common/inc/nv-linux.h
+@@ -1988,4 +1988,17 @@ static inline void nv_mutex_destroy(struct mutex *lock)
+ 
+ }
+ 
++#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-gem-user-memory.c b/nvidia-drm/nvidia-drm-gem-user-memory.c
+index 8824daa..3ea9099 100644
+--- a/nvidia-drm/nvidia-drm-gem-user-memory.c
++++ b/nvidia-drm/nvidia-drm-gem-user-memory.c
+@@ -35,6 +35,7 @@
+ #include "linux/dma-buf.h"
+ #include "linux/mm.h"
+ #include "nv-mm.h"
++#include "nv-linux.h"
+ 
+ static inline
+ void __nv_drm_gem_user_memory_free(struct nv_drm_gem_object *nv_gem)
+@@ -92,9 +93,9 @@ static int __nv_drm_gem_user_memory_mmap(struct nv_drm_gem_object *nv_gem,
+         return -EINVAL;
+     }
+ 
+-    vma->vm_flags &= ~VM_PFNMAP;
+-    vma->vm_flags &= ~VM_IO;
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_clear(vma, VM_PFNMAP);
++    vm_flags_clear(vma, VM_IO);
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     return 0;
+ }
+diff --git a/nvidia-uvm/uvm.c b/nvidia-uvm/uvm.c
+index 3e7318d..7eddff7 100644
+--- a/nvidia-uvm/uvm.c
++++ b/nvidia-uvm/uvm.c
+@@ -812,7 +812,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 df514c9..8f85ff6 100644
+--- a/nvidia/nv-mmap.c
++++ b/nvidia/nv-mmap.c
+@@ -447,7 +447,7 @@ static int nvidia_mmap_numa(
+     }
+ 
+     // Needed for the linux kernel for mapping compound pages
+-    vma->vm_flags |= VM_MIXEDMAP;
++    vm_flags_set(vma, VM_MIXEDMAP);
+ 
+     for (i = 0, addr = mmap_context->page_array[0]; i < pages;
+          addr = mmap_context->page_array[++i], start += PAGE_SIZE)
+@@ -596,7 +596,7 @@ int nvidia_mmap_helper(
+         }
+         up(&nvl->mmap_lock);
+ 
+-        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND;
++        vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND);
+     }
+     else
+     {
+@@ -663,15 +663,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;
+-- 
+2.39.2
+
diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index fbe3efc323a2..da0fc142c178 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.182.03
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"

Re: [PR PATCH] [Merged]: nvidia470: add patch for linux 6.3

[abenson]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There's a merged pull request on the void-packages repository

nvidia470: add patch for linux 6.3
https://github.com/void-linux/void-packages/pull/44041

Description:

#### Testing the changes
- I tested the changes in this PR: **NO** :(

#### Local build testing
- I built this PR locally for my native architecture, x86_64