From 84d17806baa710bf17955601ff9e9e75ada801b2 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 19 May 2022 19:38:17 +0200 Subject: [PATCH] up to 390.151 --- kernel-5.17-x8664.patch | 10 ---- kernel-5.17.patch | 57 ---------------------- xorg-driver-video-nvidia-legacy-390xx.spec | 14 ++---- 3 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 kernel-5.17-x8664.patch delete mode 100644 kernel-5.17.patch diff --git a/kernel-5.17-x8664.patch b/kernel-5.17-x8664.patch deleted file mode 100644 index 1d08e9a..0000000 --- a/kernel-5.17-x8664.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild~ 2021-12-13 15:04:30.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-uvm/nvidia-uvm.Kbuild 2022-04-02 21:49:28.303986549 +0200 -@@ -103,6 +103,7 @@ - NV_CONFTEST_FUNCTION_COMPILE_TESTS += wait_on_bit_lock_argument_count - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data - NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data -+NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove - NV_CONFTEST_FUNCTION_COMPILE_TESTS += bitmap_clear - NV_CONFTEST_FUNCTION_COMPILE_TESTS += usleep_range diff --git a/kernel-5.17.patch b/kernel-5.17.patch deleted file mode 100644 index fa70b7f..0000000 --- a/kernel-5.17.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/conftest.sh~ 2021-12-13 07:06:52.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/conftest.sh 2022-04-02 21:42:45.218675048 +0200 -@@ -1806,6 +1806,19 @@ - compile_check_conftest "$CODE" "NV_PDE_DATA_PRESENT" "" "functions" - ;; - -+ pde_data_func) -+ # -+ # Determine if the PDE_DATA() function is present. -+ # -+ CODE=" -+ #include -+ void conftest_pde_data(void) { -+ pde_data(); -+ }" -+ -+ compile_check_conftest "$CODE" "NV_PDE_DATA_FUNC_PRESENT" "" "functions" -+ ;; -+ - get_num_physpages) - # - # Determine if the get_num_physpages() function is ---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/common/inc/nv-procfs.h~ 2021-12-13 15:04:59.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/common/inc/nv-procfs.h 2022-04-02 21:44:19.777574273 +0200 -@@ -115,8 +115,12 @@ - #if defined(NV_PDE_DATA_PRESENT) - # define NV_PDE_DATA(inode) PDE_DATA(inode) - #else -+#if defined(NV_PDE_DATA_FUNC_PRESENT) -+# define NV_PDE_DATA(inode) pde_data(inode) -+#else - # define NV_PDE_DATA(inode) PDE(inode)->data - #endif -+#endif - - #if defined(NV_PROC_REMOVE_PRESENT) - # define NV_REMOVE_PROC_ENTRY(entry) \ ---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia/nvidia.Kbuild~ 2021-12-13 15:04:30.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia/nvidia.Kbuild 2022-04-02 21:48:22.121422416 +0200 -@@ -133,6 +133,7 @@ - NV_CONFTEST_FUNCTION_COMPILE_TESTS += efi_enabled - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data - NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data -+NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove - NV_CONFTEST_FUNCTION_COMPILE_TESTS += pm_vt_switch_required - NV_CONFTEST_FUNCTION_COMPILE_TESTS += xen_ioemu_inject_msi ---- NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-modeset/nvidia-modeset.Kbuild~ 2021-11-02 14:29:40.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.147-no-compat32/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2022-04-02 21:49:08.364218278 +0200 -@@ -90,6 +90,7 @@ - NV_CONFTEST_TYPE_COMPILE_TESTS += proc_dir_entry - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_create_data - NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data -+NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data_func - NV_CONFTEST_FUNCTION_COMPILE_TESTS += proc_remove - NV_CONFTEST_FUNCTION_COMPILE_TESTS += timer_setup - NV_CONFTEST_FUNCTION_COMPILE_TESTS += do_gettimeofday diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec index d5bc2c8..6b4583e 100644 --- a/xorg-driver-video-nvidia-legacy-390xx.spec +++ b/xorg-driver-video-nvidia-legacy-390xx.spec @@ -29,30 +29,28 @@ exit 1 %define no_install_post_check_so 1 -%define rel 5 +%define rel 1 %define pname xorg-driver-video-nvidia-legacy-390xx 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: 390.147 +Version: 390.151 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 Source0: https://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 7af8932a2ae9326cfe8638fe77d62441 +# Source0-md5: fe68121d6846dc23ceec22ff005cc478 Source1: https://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 7f2c2c04c6039b177d50b23a1ae223d6 +# Source1-md5: 9f91d1b97c6f4d66c4690dc4f6c1486f Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -Patch2: kernel-5.17.patch -Patch3: kernel-5.17-x8664.patch URL: https://www.nvidia.com/en-us/drivers/unix/ BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 1.752 @@ -313,10 +311,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%ifarch %{x8664} -%patch3 -p1 -%endif echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -- 2.44.0