diff options
author | Lenard Spencer <lenardrspencer@gmai.com> | 2022-11-24 20:44:56 +0700 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-11-24 20:44:56 +0700 |
commit | 004f16052c2324e957760bd47a645e5dbda5fb7d (patch) | |
tree | 2c0745a911489b376f7b95ec19efb13a7b37d86c | |
parent | ffb430e0fb46c4cc5caf58dc9e74d6de64f7ef90 (diff) |
system/nvidia-legacy390-kernel: Updated for version 390.157.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
3 files changed, 7 insertions, 56 deletions
diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel-6.0.patch b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel-6.0.patch deleted file mode 100644 index a8cf8d7c2bcab..0000000000000 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel-6.0.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 17bed78791d6f311c83ff1794d085b18c9f89730 Mon Sep 17 00:00:00 2001 -From: Joan Bruguera <joanbrugueram@gmail.com> -Date: Wed, 3 Aug 2022 00:56:57 +0200 -Subject: [PATCH] Tentative fix for NVIDIA 470.141.03 driver for Linux 6.0-rc1 - ---- - nvidia-drm/nvidia-drm-helper.c | 5 +++++ - nvidia/nv-acpi.c | 5 ++++- - nvidia/nv.c | 3 ++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -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 *); --- -2.37.1 - diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild index 7048ed1d632e9..2fa6d158340e5 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=nvidia-legacy390-kernel -VERSION=${VERSION:-390.154} -BUILD=${BUILD:-2} +VERSION=${VERSION:-390.157} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -87,9 +87,6 @@ find -L . \ unset ARCH cd kernel || exit 1 -# Patch for 6.0 kernel: -patch -p1 < $CWD/nvidia-legacy390-kernel-6.0.patch - # CC=${CC:-gcc} suppresses an otherwise harmless "compiler mismatch" # message. If you custom-build your kernel with clang, # then pass CC=clang to this script. diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info index ea06e248b254c..37b722af4badc 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy390-kernel" -VERSION="390.154" +VERSION="390.157" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run" -MD5SUM="6166b031a618a7a2ef824abdae075610" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run" -MD5SUM_x86_64="1050874ea7f8f20f5b8dbd89bdb64229" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.157/NVIDIA-Linux-x86-390.157.run" +MD5SUM="0975ee17f9c690555dfb2a342a0138b8" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run" +MD5SUM_x86_64="d564c4a0f57eb7715a5f11ed8da17b6c" REQUIRES="" MAINTAINER="Lenard Spencer" EMAIL="lenardrspencer@gmai.com" |