Bug#1077841: nvidia-graphics-drivers: dkms linux-image-6.10.3-amd64
Sebastiaan Couwenberg
sebastic at xs4all.nl
Fri Aug 9 07:27:32 BST 2024
The patch suggested by Gianluigi Tiesi in #1078124 resolves the dkms
failure.
The attached debdiff updates the packaging in unstable to include that
patch.
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
-------------- next part --------------
diff -Nru nvidia-graphics-drivers-535.183.01/debian/changelog nvidia-graphics-drivers-535.183.01/debian/changelog
--- nvidia-graphics-drivers-535.183.01/debian/changelog 2024-06-14 11:20:01.000000000 +0200
+++ nvidia-graphics-drivers-535.183.01/debian/changelog 2024-08-09 08:00:17.000000000 +0200
@@ -1,3 +1,11 @@
+nvidia-graphics-drivers (535.183.01-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch to fix DKMS failure with Linux 6.10.
+ (closes: #1077841)
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 09 Aug 2024 08:00:17 +0200
+
nvidia-graphics-drivers (535.183.01-1) unstable; urgency=medium
* New upstream LTS and Tesla branch release 535.183.01 (2024-06-04).
diff -Nru nvidia-graphics-drivers-535.183.01/debian/patches/module/fix-follow_pfn.patch nvidia-graphics-drivers-535.183.01/debian/patches/module/fix-follow_pfn.patch
--- nvidia-graphics-drivers-535.183.01/debian/patches/module/fix-follow_pfn.patch 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-535.183.01/debian/patches/module/fix-follow_pfn.patch 2024-08-09 07:58:25.000000000 +0200
@@ -0,0 +1,90 @@
+diff -ur nvidia-current-535.183.01.orig/conftest.sh nvidia-current-535.183.01/conftest.sh
+--- nvidia-current-535.183.01.orig/conftest.sh 2024-06-14 11:20:01.000000000 +0200
++++ nvidia-current-535.183.01/conftest.sh 2024-08-07 12:50:57.923895110 +0200
+@@ -5181,22 +5181,23 @@
+ compile_check_conftest "$CODE" "NV_PCI_CLASS_MULTIMEDIA_HD_AUDIO_PRESENT" "" "generic"
+ ;;
+
+- unsafe_follow_pfn)
++ follow_pfn)
+ #
+- # Determine if unsafe_follow_pfn() is present.
++ # Determine if follow_pfn() is present.
+ #
+- # unsafe_follow_pfn() was added by commit 69bacee7f9ad
+- # ("mm: Add unsafe_follow_pfn") in v5.13-rc1.
++ # follow_pfn() was added by commit 3b6748e2dd69
++ # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
++ # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
++ # from linux-next 233eb0bf3b94.
+ #
+ CODE="
+ #include <linux/mm.h>
+- void conftest_unsafe_follow_pfn(void) {
+- unsafe_follow_pfn();
++ void conftest_follow_pfn(void) {
++ follow_pfn();
+ }"
+
+- compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions"
++ compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
+ ;;
+-
+ drm_plane_atomic_check_has_atomic_state_arg)
+ #
+ # Determine if drm_plane_helper_funcs::atomic_check takes 'state'
+diff -ur nvidia-current-535.183.01.orig/nvidia/nvidia.Kbuild nvidia-current-535.183.01/nvidia/nvidia.Kbuild
+--- nvidia-current-535.183.01.orig/nvidia/nvidia.Kbuild 2024-06-14 11:20:01.000000000 +0200
++++ nvidia-current-535.183.01/nvidia/nvidia.Kbuild 2024-08-07 12:58:41.718220280 +0200
+@@ -161,7 +161,7 @@
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += vga_tryget
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc_platform_has
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter
+-NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += add_memory_driver_managed
+@@ -199,6 +199,7 @@
+
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_gpl_of_node_to_nid
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_gpl_sme_active
++NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_gpl_follow_pte
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_present_swiotlb_map_sg_attrs
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_present_swiotlb_dma_ops
+ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_present___close_fd
+diff -ur nvidia-current-535.183.01.orig/nvidia/os-mlock.c nvidia-current-535.183.01/nvidia/os-mlock.c
+--- nvidia-current-535.183.01.orig/nvidia/os-mlock.c 2024-05-12 22:26:49.000000000 +0200
++++ nvidia-current-535.183.01/nvidia/os-mlock.c 2024-08-07 13:18:21.734359573 +0200
+@@ -36,10 +36,28 @@
+ unsigned long address,
+ unsigned long *pfn)
+ {
+-#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
+- return unsafe_follow_pfn(vma, address, pfn);
+-#else
++#if defined(NV_FOLLOW_PFN_PRESENT)
+ return follow_pfn(vma, address, pfn);
++#else
++#if !NV_IS_EXPORT_SYMBOL_GPL_follow_pte
++ int status = 0;
++ spinlock_t *ptl;
++ pte_t *ptep;
++
++ if (!(vma->vm_flags & (VM_IO | VM_PFNMAP)))
++ return status;
++
++ status = follow_pte(vma, address, &ptep, &ptl);
++ if (status)
++ return status;
++ *pfn = pte_pfn(ptep_get(ptep));
++
++ // The lock is acquired inside follow_pte()
++ pte_unmap_unlock(ptep, ptl);
++ return 0;
++#else // NV_IS_EXPORT_SYMBOL_GPL_follow_pte
++ return -1;
++#endif // NV_IS_EXPORT_SYMBOL_GPL_follow_pte
+ #endif
+ }
+
diff -Nru nvidia-graphics-drivers-535.183.01/debian/patches/module/series.in nvidia-graphics-drivers-535.183.01/debian/patches/module/series.in
--- nvidia-graphics-drivers-535.183.01/debian/patches/module/series.in 2024-06-14 11:20:01.000000000 +0200
+++ nvidia-graphics-drivers-535.183.01/debian/patches/module/series.in 2024-08-09 07:58:20.000000000 +0200
@@ -5,6 +5,7 @@
0001-bump-minimum-supported-kernel-version-to-3.10.patch
0002-conftest.sh-remove-empty-lines-from-uts_release-outp.patch
0034-fix-typos.patch
+fix-follow_pfn.patch
# build system updates
fragile-ARCH.patch
More information about the pkg-nvidia-devel
mailing list