diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-02 18:19:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-02 18:19:08 +0000 |
| commit | f73a2bb41b4f747d22c63339c9c3068e082b56e2 (patch) | |
| tree | b6ffef67fa18c1e9a98c05bd3af41a7e20ded038 /sys-kernel/nvidia-drivers-dkms/files | |
| parent | 77de10eb38e5e191674adaf754c0bbaef9d39d1d (diff) | |
x11-drivers/nvidia-drivers-390xx : version bump
Diffstat (limited to 'sys-kernel/nvidia-drivers-dkms/files')
| -rw-r--r-- | sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch | 46 | ||||
| -rw-r--r-- | sys-kernel/nvidia-drivers-dkms/files/dkms390.patch | 2 |
2 files changed, 1 insertions, 47 deletions
diff --git a/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch b/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.patch deleted file mode 100644 index ec5b2542..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/390-kernel6.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/kernel/nvidia-drm/nvidia-drm-helper.c b/kernel/nvidia-drm/nvidia-drm-helper.c -index 3831180..fa03d51 100644 ---- a/kernel/nvidia-drm/nvidia-drm-helper.c -+++ b/kernel/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/kernel/nvidia/nv-acpi.c b/kernel/nvidia/nv-acpi.c -index 2b7b988..76c36fa 100644 ---- a/kernel/nvidia/nv-acpi.c -+++ b/kernel/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/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch index 6e7add52..45fff603 100644 --- a/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch +++ b/sys-kernel/nvidia-drivers-dkms/files/dkms390.patch @@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf -PACKAGE_NAME="nvidia" -PACKAGE_VERSION="__VERSION_STRING" +PACKAGE_NAME="nvidia-drivers-dkms" -+PACKAGE_VERSION="390.154" ++PACKAGE_VERSION="390.157" AUTOINSTALL="yes" # By default, DKMS will add KERNELRELEASE to the make command line; however, |