diff --git a/nvidia_470-470.161.03-ignore_cc_mismatch.patch b/nvidia_470-470.161.03-ignore_cc_mismatch.patch new file mode 100644 index 0000000..909e88f --- /dev/null +++ b/nvidia_470-470.161.03-ignore_cc_mismatch.patch @@ -0,0 +1,11 @@ +--- NVIDIA-Linux-x86_64-470.161.03/kernel/conftest.sh.orig 2023-07-27 18:03:50.103252092 +0200 ++++ NVIDIA-Linux-x86_64-470.161.03/kernel/conftest.sh 2023-07-27 18:03:55.130225224 +0200 +@@ -4955,7 +4955,7 @@ + echo "The kernel was built with ${kernel_cc_string}, but the" \ + "current compiler version is `$CC --version | head -n 1`."; + fi +- exit 1; ++ exit 0; + fi + ;; + diff --git a/nvidia_470-470.161.03-kernel-6.4.patch b/nvidia_470-470.161.03-kernel-6.4.patch new file mode 100644 index 0000000..966d58e --- /dev/null +++ b/nvidia_470-470.161.03-kernel-6.4.patch @@ -0,0 +1,35 @@ +From 4981428cda825b415eea60313f71bf386cc9f7e1 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera +Date: Sat, 25 Feb 2023 10:57:26 +0000 +Subject: [PATCH] Tentative fix for NVIDIA 470.199.02 driver for Linux 6.4-rc1 + +--- + nvidia-drm/nvidia-drm-drv.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/nvidia-drm/nvidia-drm-drv.c ++++ b/nvidia-drm/nvidia-drm-drv.c +@@ -20,6 +20,7 @@ + * DEALINGS IN THE SOFTWARE. + */ + ++#include + #include "nvidia-drm-conftest.h" /* NV_DRM_AVAILABLE and NV_DRM_DRM_GEM_H_PRESENT */ + + #include "nvidia-drm-priv.h" +@@ -873,9 +874,13 @@ + + nv_drm_driver.dumb_create = nv_drm_dumb_create; + nv_drm_driver.dumb_map_offset = nv_drm_dumb_map_offset; ++// Rel. commit "drm: remove dumb_destroy callback" (Christian König, 26 Jan 2023) ++// NB: No resources are leaked, the kernel releases the same resources by default ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) + #if defined(NV_DRM_DRIVER_HAS_DUMB_DESTROY) + nv_drm_driver.dumb_destroy = nv_drm_dumb_destroy; + #endif /* NV_DRM_DRIVER_HAS_DUMB_DESTROY */ ++#endif + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } + +-- +2.40.1 diff --git a/nvidia_470.spec b/nvidia_470.spec index 8c635ad..2d8d215 100644 --- a/nvidia_470.spec +++ b/nvidia_470.spec @@ -1,9 +1,9 @@ %define nvidia_current_ver %version %define nvidia_current_libver %version Name: nvidia_470 -Version: 470.161.03 +Version: 470.199.02 Epoch: 1 -Release: 2mamba +Release: 1mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba @@ -15,6 +15,8 @@ Source1: nvidia.sysusers Source2: nvidia-drm-outputclass.conf Patch0: nvidia-331.20-x86-conftest.patch Patch1: nvidia-367.35-kernel-4.6.patch +Patch2: nvidia_470-470.161.03-kernel-6.4.patch +Patch3: nvidia_470-470.161.03-ignore_cc_mismatch.patch License: no OSI Approved ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -101,6 +103,11 @@ sed -i "s|__UTILS_PATH__|%{_bindir}|;s|__PIXMAP_PATH__|%{_datadir}/pixmaps|" \ cd current #%patch0 -p1 #%patch1 -p1 +cd kernel +%patch 2 -p1 -b .kernel-6.4 +cd .. +%patch 3 -p1 + tar xf nvidia-persistenced-init.tar.bz2 cd .. @@ -401,6 +408,9 @@ INITRAMFS=/boot/initramfs-${KVER}.img %doc current/{NVIDIA_Changelog,README.txt} current/html %changelog +* Thu Jul 27 2023 Silvan Calarco 470.199.02-1mamba +- update to 470.199.02 + * Sat Mar 25 2023 Silvan Calarco 470.161.03-2mamba - install libnvidia-gtk3.so* to fix nvidia-settings - modprobe.d/nvidia.conf: set nvidia_drm.modeset=1