forked from pool/nvidia-open-driver-G06-signed
Stefan Dirsch
c44ea593cc
repository with CUDA 12.6/560.x.y drivers OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=127
65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
--- open-gpu-kernel-modules-555.42.06/kernel-open/conftest.sh 2024-07-10 18:51:10.000000000 +0200
|
|
+++ open-gpu-kernel-modules-560.35.03/kernel-open/conftest.sh 2024-08-19 19:46:21.000000000 +0200
|
|
@@ -5252,25 +5252,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.
|
|
- #
|
|
- # Note: this commit never made it to the linux kernel, so
|
|
- # unsafe_follow_pfn() never existed.
|
|
+ # 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'
|
|
--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/nvidia.Kbuild 2024-07-10 18:51:10.000000000 +0200
|
|
+++ open-gpu-kernel-modules-560.35.03/kernel-open/nvidia/nvidia.Kbuild 2024-08-19 19:46:21.000000000 +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
|
|
--- open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c.orig 2024-08-28 13:52:38.761337000 +0200
|
|
+++ open-gpu-kernel-modules-555.42.06/kernel-open/nvidia/os-mlock.c 2024-08-28 13:53:44.976357000 +0200
|
|
@@ -36,10 +36,10 @@ static inline int nv_follow_pfn(struct v
|
|
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
|
|
+ return -1;
|
|
#endif
|
|
}
|
|
|