system/nvidia-legacy470-kernel: Updated for version 470.161.03.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 5 insertions, 57 deletions

diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel-6.0.patch b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel-6.0.patch
deleted file mode 100644
index febc5cf7c50f..000000000000
--- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel-6.0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/nvidia-drm/nvidia-drm-helper.c b/nvidia-drm/nvidia-drm-helper.c
-index 3831180..fa03d51 100644
---- a/nvidia-drm/nvidia-drm-helper.c
-+++ b/nvidia-drm/nvidia-drm-helper.c
-@@ -41,6 +41,11 @@
- #include <drm/drm_atomic_uapi.h>
- #endif
- 
-+// Add header which is no longer indirectly referenced as of Linux 6.0-rc1
-+#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
-+#include <drm/drm_framebuffer.h>
-+#endif
-+
- static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb)
- {
- #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)
-diff --git a/nvidia/nv-acpi.c b/nvidia/nv-acpi.c
-index 2b7b988..76c36fa 100644
---- a/nvidia/nv-acpi.c
-+++ b/nvidia/nv-acpi.c
-@@ -16,7 +16,10 @@
- 
- #include <linux/acpi.h>
- 
--#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
-+#include <linux/version.h>
-+// Rel.commit "ACPI: bus: Drop unused list heads from struct acpi_device" (Rafael J. Wysocki, 4 Jun 2022)
-+// Disable ACPI support due to more GPL stuff (acpi_dev_for_each_child is only GPL-exported)
-+#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
- static NV_STATUS   nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
- static NV_STATUS   nv_acpi_extract_buffer  (const union acpi_object *, void *, NvU32, NvU32 *);
- static NV_STATUS   nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *);
-diff --git a/nvidia/nv.c b/nvidia/nv.c
-index ab7d17c..e313e2e 100644
---- a/nvidia/nv.c
-+++ b/nvidia/nv.c
-@@ -5423,7 +5423,8 @@ NvBool NV_API_CALL nv_s2idle_pm_configured(void)
- {
-     NvU8 buf[8];
- 
--#if defined(NV_SEQ_READ_ITER_PRESENT)
-+// FIXME: Avoid this code path because on Linux 6.0-rc1, init_sync_kiocb references a GPL symbol
-+#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
-     struct file *file;
-     ssize_t num_read;
-     struct kiocb kiocb;
--- 
-2.37.1
-
diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild
index cc4418367727..0982c17a4030 100644
--- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild
+++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.SlackBuild
@@ -29,8 +29,8 @@
 # see nvidia-driver/changelog.txt
 
 PRGNAM=nvidia-legacy470-kernel
-VERSION=${VERSION:-470.141.03}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-470.161.03}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -86,9 +86,6 @@ find -L . \
 
 (cd kernel || exit 1
 
-# Patch for 6.0 kernel:
-patch -p1 < $CWD/nvidia-legacy470-kernel-6.0.patch
-
   unset ARCH
 
 # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch"
diff --git a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info
index a4d588b80bd3..61e46af25ec8 100644
--- a/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info
+++ b/system/nvidia-legacy470-kernel/nvidia-legacy470-kernel.info
@@ -1,10 +1,10 @@
 PRGNAM="nvidia-legacy470-kernel"
-VERSION="470.141.03"
+VERSION="470.161.03"
 HOMEPAGE="http://www.nvidia.com"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.141.03/NVIDIA-Linux-x86_64-470.141.03.run"
-MD5SUM_x86_64="ff6d869676ddfd7852aa7de77d7a0eb9"
+DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/470.161.03/NVIDIA-Linux-x86_64-470.161.03.run"
+MD5SUM_x86_64="0652fff030ee29664ad728dd86e9f5d6"
 REQUIRES=""
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"