From 5ac3ee6ab34ae7fd709618c773d5fa5b98bf910b Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 7 Apr 2020 22:54:47 +0200 Subject: [PATCH] up to 440.82 --- kernel-5.6.patch | 504 ---------------------------------- xorg-driver-video-nvidia.spec | 8 +- 2 files changed, 3 insertions(+), 509 deletions(-) delete mode 100644 kernel-5.6.patch diff --git a/kernel-5.6.patch b/kernel-5.6.patch deleted file mode 100644 index 5304000..0000000 --- a/kernel-5.6.patch +++ /dev/null @@ -1,504 +0,0 @@ -diff --git a/kernel/common/inc/nv-procfs.h b/kernel/common/inc/nv-procfs.h -index 8b53f86..4c5aceb 100644 ---- a/kernel/common/inc/nv-procfs.h -+++ b/kernel/common/inc/nv-procfs.h -@@ -28,6 +28,18 @@ - - #define IS_EXERCISE_ERROR_FORWARDING_ENABLED() (EXERCISE_ERROR_FORWARDING) - -+#if defined(NV_HAVE_PROC_OPS) -+#define NV_CREATE_PROC_FILE(filename,parent,__name,__data) \ -+ ({ \ -+ struct proc_dir_entry *__entry; \ -+ int mode = (S_IFREG | S_IRUGO); \ -+ const struct proc_ops *fops = &nv_procfs_##__name##_fops; \ -+ if (fops->proc_write != 0) \ -+ mode |= S_IWUSR; \ -+ __entry = proc_create_data(filename, mode, parent, fops, __data);\ -+ __entry; \ -+ }) -+#else - #define NV_CREATE_PROC_FILE(filename,parent,__name,__data) \ - ({ \ - struct proc_dir_entry *__entry; \ -@@ -38,6 +50,7 @@ - __entry = proc_create_data(filename, mode, parent, fops, __data);\ - __entry; \ - }) -+#endif - - /* - * proc_mkdir_mode exists in Linux 2.6.9, but isn't exported until Linux 3.0. -@@ -77,6 +90,44 @@ - remove_proc_entry(entry->name, entry->parent); - #endif - -+#if defined(NV_HAVE_PROC_OPS) -+#define NV_DEFINE_SINGLE_PROCFS_FILE(name, open_callback, close_callback) \ -+ static int nv_procfs_open_##name( \ -+ struct inode *inode, \ -+ struct file *filep \ -+ ) \ -+ { \ -+ int ret; \ -+ ret = single_open(filep, nv_procfs_read_##name, \ -+ NV_PDE_DATA(inode)); \ -+ if (ret < 0) \ -+ { \ -+ return ret; \ -+ } \ -+ ret = open_callback(); \ -+ if (ret < 0) \ -+ { \ -+ single_release(inode, filep); \ -+ } \ -+ return ret; \ -+ } \ -+ \ -+ static int nv_procfs_release_##name( \ -+ struct inode *inode, \ -+ struct file *filep \ -+ ) \ -+ { \ -+ close_callback(); \ -+ return single_release(inode, filep); \ -+ } \ -+ \ -+ static const struct proc_ops nv_procfs_##name##_fops = { \ -+ .proc_open = nv_procfs_open_##name, \ -+ .proc_read = seq_read, \ -+ .proc_lseek = seq_lseek, \ -+ .proc_release = nv_procfs_release_##name, \ -+ }; -+#else - #define NV_DEFINE_SINGLE_PROCFS_FILE(name, open_callback, close_callback) \ - static int nv_procfs_open_##name( \ - struct inode *inode, \ -@@ -114,6 +165,7 @@ - .llseek = seq_lseek, \ - .release = nv_procfs_release_##name, \ - }; -+#endif - - #endif /* CONFIG_PROC_FS */ - -diff --git a/kernel/common/inc/nv-time.h b/kernel/common/inc/nv-time.h -index 968b873..f03c7b0 100644 ---- a/kernel/common/inc/nv-time.h -+++ b/kernel/common/inc/nv-time.h -@@ -27,7 +27,17 @@ - - #include - --static inline void nv_gettimeofday(struct timeval *tv) -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) -+#define nv_timeval timeval -+#else -+struct nv_timeval { -+ __kernel_long_t tv_sec; -+ __kernel_suseconds_t tv_usec; -+}; -+#endif -+ -+static inline void nv_gettimeofday(struct nv_timeval *tv) - { - #ifdef NV_DO_GETTIMEOFDAY_PRESENT - do_gettimeofday(tv); -@@ -36,7 +41,7 @@ static inline void nv_gettimeofday(struct timeval *tv) - - ktime_get_real_ts64(&now); - -- *tv = (struct timeval) { -+ *tv = (struct nv_timeval) { - .tv_sec = now.tv_sec, - .tv_usec = now.tv_nsec/1000, - }; -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index 57d85a4..4eb703f 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -806,6 +806,42 @@ compile_test() { - compile_check_conftest "$CODE" "NV_FILE_OPERATIONS_HAS_IOCTL" "" "types" - ;; - -+ proc_ops) -+ CODE=" -+ #include -+ int conftest_proc_ops(void) { -+ return offsetof(struct proc_ops, proc_open); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_HAVE_PROC_OPS" "" "types" -+ ;; -+ -+ ktime_get_raw_ts64) -+ # -+ # Determine if the ktime_get_raw_ts64() function is present. -+ # -+ CODE=" -+ #include -+ int conftest_ktime_get_raw_ts64(void) { -+ ktime_get_raw_ts64(); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_KTIME_GET_RAW_TS64_PRESENT" "" "functions" -+ ;; -+ -+ ktime_get_real_ts64) -+ # -+ # Determine if the ktime_get_real_ts64() function is present. -+ # -+ CODE=" -+ #include -+ int conftest_ktime_get_raw_ts64(void) { -+ ktime_get_real_ts64(); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_KTIME_GET_REAL_TS64_PRESENT" "" "functions" -+ ;; -+ - sg_alloc_table) - # - # sg_alloc_table_from_pages added by commit efc42bc98058 -diff --git a/kernel/nvidia-modeset/nvidia-modeset-linux.c b/kernel/nvidia-modeset/nvidia-modeset-linux.c -index 0ca2c7d..8902143 100644 ---- a/kernel/nvidia-modeset/nvidia-modeset-linux.c -+++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c -@@ -266,7 +266,7 @@ void NVKMS_API_CALL nvkms_usleep(NvU64 usec) - - NvU64 NVKMS_API_CALL nvkms_get_usec(void) - { -- struct timeval tv; -+ struct nv_timeval tv; - - nv_gettimeofday(&tv); - -diff --git a/kernel/nvidia-uvm/uvm_linux.h b/kernel/nvidia-uvm/uvm_linux.h -index 30a9dea..1a20eff 100644 ---- a/kernel/nvidia-uvm/uvm_linux.h -+++ b/kernel/nvidia-uvm/uvm_linux.h -@@ -301,7 +301,16 @@ static inline uint64_t NV_DIV64(uint64_t dividend, uint64_t divisor, uint64_t *r - } - #endif - --#if defined(CLOCK_MONOTONIC_RAW) -+#if defined(NV_KTIME_GET_RAW_TS64_PRESENT) -+static inline NvU64 NV_GETTIME(void) -+{ -+ struct timespec64 ts; -+ -+ ktime_get_raw_ts64(&ts); -+ -+ return (ts.tv_sec * 1000000000ULL + ts.tv_nsec); -+} -+#elif defined(CLOCK_MONOTONIC_RAW) - /* Return a nanosecond-precise value */ - static inline NvU64 NV_GETTIME(void) - { -@@ -317,7 +326,7 @@ static inline NvU64 NV_GETTIME(void) - * available non-GPL symbols. */ - static inline NvU64 NV_GETTIME(void) - { -- struct timeval tv = {0}; -+ struct nv_timeval tv = {0}; - - nv_gettimeofday(&tv); - -diff --git a/kernel/nvidia/linux_nvswitch.c b/kernel/nvidia/linux_nvswitch.c -index 1d2c1bc..0a0b4e8 100644 ---- a/kernel/nvidia/linux_nvswitch.c -+++ b/kernel/nvidia/linux_nvswitch.c -@@ -1578,10 +1578,17 @@ nvswitch_os_get_platform_time - void - ) - { -+#if defined(NV_KTIME_GET_REAL_TS64_PRESENT) -+ struct timespec64 ts64; -+ -+ ktime_get_real_ts64(&ts64); -+ return ((NvU64)(ts64.tv_sec * NSEC_PER_SEC) + ts64.tv_nsec); -+#else - struct timespec ts; - - getnstimeofday(&ts); - return ((NvU64) timespec_to_ns(&ts)); -+#endif - } - - void -diff --git a/kernel/nvidia/nv-procfs.c b/kernel/nvidia/nv-procfs.c -index 064d727..a7308d3 100644 ---- a/kernel/nvidia/nv-procfs.c -+++ b/kernel/nvidia/nv-procfs.c -@@ -452,6 +452,15 @@ done: - return ((status < 0) ? status : (int)count); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_registry_fops = { -+ .proc_open = nv_procfs_open_registry, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_registry, -+}; -+#else - static struct file_operations nv_procfs_registry_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_registry, -@@ -460,6 +469,7 @@ static struct file_operations nv_procfs_registry_fops = { - .llseek = seq_lseek, - .release = nv_procfs_close_registry, - }; -+#endif - - #if defined(CONFIG_PM) - static int -@@ -531,6 +541,15 @@ nv_procfs_open_suspend_depth( - return single_open(file, nv_procfs_show_suspend_depth, NULL); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_suspend_depth_fops = { -+ .proc_open = nv_procfs_open_suspend_depth, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_suspend_depth, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release -+}; -+#else - static struct file_operations nv_procfs_suspend_depth_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_suspend_depth, -@@ -539,6 +558,7 @@ static struct file_operations nv_procfs_suspend_depth_fops = { - .llseek = seq_lseek, - .release = single_release - }; -+#endif - - static int - nv_procfs_show_suspend( -@@ -613,6 +633,15 @@ nv_procfs_open_suspend( - return single_open(file, nv_procfs_show_suspend, NULL); - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_suspend_fops = { -+ .proc_open = nv_procfs_open_suspend, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_suspend, -+ .proc_lseek = seq_lseek, -+ .proc_release = single_release -+}; -+#else - static struct file_operations nv_procfs_suspend_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_suspend, -@@ -622,6 +651,7 @@ static struct file_operations nv_procfs_suspend_fops = { - .release = single_release - }; - #endif -+#endif - - /* - * Forwards error to nv_log_error which exposes data to vendor callback -@@ -724,12 +754,20 @@ done: - return status; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_exercise_error_forwarding_fops = { -+ .proc_open = nv_procfs_open_exercise_error_forwarding, -+ .proc_write = nv_procfs_write_file, -+ .proc_release = nv_procfs_close_exercise_error_forwarding, -+}; -+#else - static struct file_operations nv_procfs_exercise_error_forwarding_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_exercise_error_forwarding, - .write = nv_procfs_write_file, - .release = nv_procfs_close_exercise_error_forwarding, - }; -+#endif - - static int - nv_procfs_read_unbind_lock( -@@ -851,6 +889,15 @@ done: - return rc; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static struct proc_ops nv_procfs_unbind_lock_fops = { -+ .proc_open = nv_procfs_open_unbind_lock, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_unbind_lock, -+}; -+#else - static struct file_operations nv_procfs_unbind_lock_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_unbind_lock, -@@ -859,6 +906,7 @@ static struct file_operations nv_procfs_unbind_lock_fops = { - .llseek = seq_lseek, - .release = nv_procfs_close_unbind_lock, - }; -+#endif - - static const char* - numa_status_describe(nv_numa_status_t state) -@@ -1187,6 +1235,22 @@ done: - return retval; - } - -+#if defined(NV_HAVE_PROC_OPS) -+static const struct proc_ops nv_procfs_numa_status_fops = { -+ .proc_open = nv_procfs_open_numa_status, -+ .proc_read = seq_read, -+ .proc_write = nv_procfs_write_file, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_numa_status, -+}; -+ -+static const struct proc_ops nv_procfs_offline_pages_fops = { -+ .proc_open = nv_procfs_open_offline_pages, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = nv_procfs_close_offline_pages, -+}; -+#else - static const struct file_operations nv_procfs_numa_status_fops = { - .owner = THIS_MODULE, - .open = nv_procfs_open_numa_status, -@@ -1203,6 +1267,7 @@ static const struct file_operations nv_procfs_offline_pages_fops = { - .llseek = seq_lseek, - .release = nv_procfs_close_offline_pages, - }; -+#endif - - static int - nv_procfs_read_text_file( -diff --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild -index 5ec3e65..339a757 100644 ---- a/kernel/nvidia/nvidia.Kbuild -+++ b/kernel/nvidia/nvidia.Kbuild -@@ -150,6 +150,9 @@ NV_CONFTEST_SYMBOL_COMPILE_TESTS += is_export_symbol_present_swiotlb_dma_ops - NV_CONFTEST_TYPE_COMPILE_TESTS += acpi_op_remove - NV_CONFTEST_TYPE_COMPILE_TESTS += outer_flush_all - NV_CONFTEST_TYPE_COMPILE_TESTS += file_operations -+NV_CONFTEST_TYPE_COMPILE_TESTS += proc_ops -+NV_CONFTEST_TYPE_COMPILE_TESTS += ktime_get_raw_ts64 -+NV_CONFTEST_TYPE_COMPILE_TESTS += ktime_get_real_ts64 - NV_CONFTEST_TYPE_COMPILE_TESTS += file_inode - NV_CONFTEST_TYPE_COMPILE_TESTS += kuid_t - NV_CONFTEST_TYPE_COMPILE_TESTS += dma_ops -diff --git a/kernel/nvidia/nvlink_linux.c b/kernel/nvidia/nvlink_linux.c -index c84b36a..54fe244 100644 ---- a/kernel/nvidia/nvlink_linux.c -+++ b/kernel/nvidia/nvlink_linux.c -@@ -513,8 +513,8 @@ int NVLINK_API_CALL nvlink_memcmp(const void *s1, const void *s2, NvLength size) - - static NvBool nv_timer_less_than - ( -- const struct timeval *a, -- const struct timeval *b -+ const struct nv_timeval *a, -+ const struct nv_timeval *b - ) - { - return (a->tv_sec == b->tv_sec) ? (a->tv_usec < b->tv_usec) -@@ -523,9 +523,9 @@ static NvBool nv_timer_less_than - - static void nv_timeradd - ( -- const struct timeval *a, -- const struct timeval *b, -- struct timeval *result -+ const struct nv_timeval *a, -+ const struct nv_timeval *b, -+ struct nv_timeval *result - ) - { - result->tv_sec = a->tv_sec + b->tv_sec; -@@ -539,9 +539,9 @@ static void nv_timeradd - - static void nv_timersub - ( -- const struct timeval *a, -- const struct timeval *b, -- struct timeval *result -+ const struct nv_timeval *a, -+ const struct nv_timeval *b, -+ struct nv_timeval *result - ) - { - result->tv_sec = a->tv_sec - b->tv_sec; -@@ -561,7 +561,7 @@ void NVLINK_API_CALL nvlink_sleep(unsigned int ms) - unsigned long us; - unsigned long jiffies; - unsigned long mdelay_safe_msec; -- struct timeval tm_end, tm_aux; -+ struct nv_timeval tm_end, tm_aux; - - nv_gettimeofday(&tm_aux); - -diff --git a/kernel/nvidia/os-interface.c b/kernel/nvidia/os-interface.c -index 07f1b77..239be58 100644 ---- a/kernel/nvidia/os-interface.c -+++ b/kernel/nvidia/os-interface.c -@@ -463,7 +463,7 @@ NV_STATUS NV_API_CALL os_get_current_time( - NvU32 *useconds - ) - { -- struct timeval tm; -+ struct nv_timeval tm; - - nv_gettimeofday(&tm); - -@@ -477,9 +477,15 @@ NV_STATUS NV_API_CALL os_get_current_time( - - void NV_API_CALL os_get_current_tick(NvU64 *nseconds) - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) -+ struct timespec64 ts; -+ -+ jiffies_to_timespec64(jiffies, &ts); -+#else - struct timespec ts; - - jiffies_to_timespec(jiffies, &ts); -+#endif - - *nseconds = ((NvU64)ts.tv_sec * NSEC_PER_SEC + (NvU64)ts.tv_nsec); - } -@@ -549,7 +555,7 @@ NV_STATUS NV_API_CALL os_delay_us(NvU32 MicroSeconds) - unsigned long usec; - - #ifdef NV_CHECK_DELAY_ACCURACY -- struct timeval tm1, tm2; -+ struct nv_timeval tm1, tm2; - - nv_gettimeofday(&tm1); - #endif -@@ -589,9 +595,9 @@ NV_STATUS NV_API_CALL os_delay(NvU32 MilliSeconds) - unsigned long MicroSeconds; - unsigned long jiffies; - unsigned long mdelay_safe_msec; -- struct timeval tm_end, tm_aux; -+ struct nv_timeval tm_end, tm_aux; - #ifdef NV_CHECK_DELAY_ACCURACY -- struct timeval tm_start; -+ struct nv_timeval tm_start; - #endif - - nv_gettimeofday(&tm_aux); -@@ -1954,7 +1960,7 @@ static NV_STATUS NV_API_CALL _os_ipmi_receive_resp - { - struct ipmi_recv_msg *rx_msg; - int err_no; -- struct timeval tv; -+ struct nv_timeval tv; - NvU64 start_time; - - nv_gettimeofday(&tv); diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index a87556b..8a90b7a 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -26,26 +26,25 @@ exit 1 %define no_install_post_check_so 1 -%define rel 2 +%define rel 1 %define pname xorg-driver-video-nvidia Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 440.64 +Version: 440.82 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run -# Source0-md5: ba746d5b5f50369139bbed47da04aa74 +# Source0-md5: 80eb4fd64124c5cab0ebf560f84a9bfa Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-desktop.patch -Patch1: kernel-5.6.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.32}} @@ -246,7 +245,6 @@ rm -rf NVIDIA-Linux-x86_64-%{version} /bin/sh %{SOURCE0} --extract-only %setup -qDT -n NVIDIA-Linux-x86_64-%{version} %patch0 -p1 -%patch1 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -- 2.43.0