Sync with Github

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c9ce6f436616..93b0e3787890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -210,7 +210,8 @@ fi
 # NVIDIA pre-build module support
 if [ -n "$_build_nvidia" ]; then
     source+=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${_nv_ver}/${_nv_pkg}.run"
-             "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch")
+             "${_patchsource}/misc/nvidia/make-modeset-fbdev-default.patch"
+             "${_patchsource}/misc/nvidia/0001-NVIDIA-take-modeset-ownership-early.patch")
 fi
 
 ## List of CachyOS schedulers
@@ -256,6 +257,7 @@ prepare() {
         src="${src##*/}"
         src="${src%.zst}"
         [[ $src = make-modeset-fbdev-default.patch ]] && continue
+        [[ $src = 0001-NVIDIA-take-modeset-ownership-early.patch ]] && continue
         [[ $src = *.patch ]] || continue
         echo "Applying patch $src..."
         patch -Np1 < "../$src"
@@ -530,6 +532,7 @@ prepare() {
 
         # Use fbdev and modeset as default
         patch -Np1 -i "${srcdir}/make-modeset-fbdev-default.patch" -d "${srcdir}/${_nv_pkg}"
+        patch -Np2 --no-backup-if-mismatch -i "${srcdir}/0001-NVIDIA-take-modeset-ownership-early.patch" -d "${srcdir}/${_nv_pkg}/kernel"
     fi
 }