From 6f6eda299bf30b2a30f85a08736ea67348523a5c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 1 Nov 2023 11:39:20 +0100 Subject: [PATCH] nvidia470: update to 470.223.02. --- srcpkgs/nvidia470/patches/linux-6.5.patch | 82 ----------------------- srcpkgs/nvidia470/template | 6 +- 2 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 srcpkgs/nvidia470/patches/linux-6.5.patch diff --git a/srcpkgs/nvidia470/patches/linux-6.5.patch b/srcpkgs/nvidia470/patches/linux-6.5.patch deleted file mode 100644 index f3df4cee06b51..0000000000000 --- a/srcpkgs/nvidia470/patches/linux-6.5.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0ca9614e5b074d3dd01e95f47b3555f48e74f622 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= -Date: Wed, 17 May 2023 21:54:08 +0000 -Subject: [PATCH] Tentative fix for NVIDIA 470.182.03 driver for Linux 6.5-rc1 - ---- - common/inc/nv-mm.h | 45 +++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 43 insertions(+), 2 deletions(-) - -diff --git a/common/inc/nv-mm.h b/common/inc/nv-mm.h -index 54f6f60..25333e8 100644 ---- a/common/inc/nv-mm.h -+++ b/common/inc/nv-mm.h -@@ -23,6 +23,7 @@ - #ifndef __NV_MM_H__ - #define __NV_MM_H__ - -+#include - #include "conftest.h" - - #if !defined(NV_VM_FAULT_T_IS_PRESENT) -@@ -47,7 +48,27 @@ typedef int vm_fault_t; - * - */ - --#if defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT) -+// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages()" (Lorenzo Stoakes, 14 May 2023) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0) -+#include -+ -+static inline long NV_GET_USER_PAGES(unsigned long start, -+ unsigned long nr_pages, -+ int write, -+ int force, -+ struct page **pages, -+ struct vm_area_struct **vmas) -+{ -+ unsigned int flags = 0; -+ -+ if (write) -+ flags |= FOLL_WRITE; -+ if (force) -+ flags |= FOLL_FORCE; -+ -+ return get_user_pages(start, nr_pages, flags, pages); -+} -+#elif defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT) - #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS) - #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) -@@ -130,7 +151,27 @@ typedef int vm_fault_t; - * - */ - --#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT) -+// Rel. commit. "mm/gup: remove unused vmas parameter from get_user_pages_remote()" (Lorenzo Stoakes, 14 May 2023) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0) -+static inline long NV_GET_USER_PAGES_REMOTE(struct task_struct *tsk, -+ struct mm_struct *mm, -+ unsigned long start, -+ unsigned long nr_pages, -+ int write, -+ int force, -+ struct page **pages, -+ struct vm_area_struct **vmas) -+{ -+ unsigned int flags = 0; -+ -+ if (write) -+ flags |= FOLL_WRITE; -+ if (force) -+ flags |= FOLL_FORCE; -+ -+ return get_user_pages_remote(mm, start, nr_pages, flags, pages, NULL); -+} -+#elif defined(NV_GET_USER_PAGES_REMOTE_PRESENT) - #if defined(NV_GET_USER_PAGES_REMOTE_HAS_WRITE_AND_FORCE_ARGS) - #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote - #else --- -2.41.0 - diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template index d095ce2cdeacf..39f53ede8212f 100644 --- a/srcpkgs/nvidia470/template +++ b/srcpkgs/nvidia470/template @@ -3,8 +3,8 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)" pkgname=nvidia470 -version=470.199.02 -revision=2 +version=470.223.02 +revision=1 maintainer="Andrew Benson " license="custom:NVIDIA Proprietary" homepage="https://www.nvidia.com/en-us/drivers/unix/" @@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1 nvidia390>=0" _pkg="NVIDIA-Linux-x86_64-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" -checksum=fdf8200edf11ce32c35b42621a3af8695e111a77c428bf0c4d3438b428d768fd +checksum=b36862d5336cc3e6ebe8ec3ab4f885b183da258f1dfb1e05ae406b3f6c4d44f8 # subpackages need to be processed in this specific order subpackages="nvidia470-gtklibs nvidia470-dkms nvidia470-opencl nvidia470-libs nvidia470-libs-32bit" depends="nvidia470-libs-${version}_${revision}