From e2a98a0a3b455702351c5179ac1f990128c64fef Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 22 Feb 2019 22:08:25 +0100 Subject: [PATCH] up to 390.116 - removed obsolete patches --- kernel-4.19.patch | 48 --------------- kernel-4.20.patch | 55 ----------------- kernel-4.4.169.patch | 69 ---------------------- xorg-driver-video-nvidia-legacy-390xx.spec | 14 ++--- 4 files changed, 4 insertions(+), 182 deletions(-) delete mode 100644 kernel-4.19.patch delete mode 100644 kernel-4.20.patch delete mode 100644 kernel-4.4.169.patch diff --git a/kernel-4.19.patch b/kernel-4.19.patch deleted file mode 100644 index 6b2e217..0000000 --- a/kernel-4.19.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c.orig 2018-08-22 02:55:29.000000000 +0200 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-10-27 14:51:02.291106466 +0200 -@@ -30,6 +30,9 @@ - #include "nvidia-drm-connector.h" - #include "nvidia-drm-crtc.h" - -+#include -+#include -+ - #include - - #include -@@ -216,7 +219,11 @@ - - /* Attach encoder and connector */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) - ret = drm_mode_connector_attach_encoder(connector, encoder); -+#else -+ ret = drm_connector_attach_encoder(connector, encoder); -+#endif - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c~ 2018-08-22 02:55:29.000000000 +0200 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c 2018-10-27 14:54:53.714379051 +0200 -@@ -30,6 +30,9 @@ - #include "nvidia-drm-utils.h" - #include "nvidia-drm-encoder.h" - -+#include -+#include -+ - #include - - #include -@@ -226,7 +229,11 @@ - - - if (nv_connector->edid != NULL) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) - drm_mode_connector_update_edid_property( -+#else -+ drm_connector_update_edid_property( -+#endif - connector, nv_connector->edid); - } - diff --git a/kernel-4.20.patch b/kernel-4.20.patch deleted file mode 100644 index 33279b1..0000000 --- a/kernel-4.20.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c~ 2018-08-22 09:55:22.000000000 +0900 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c 2019-01-02 09:55:45.271845101 +0900 -@@ -1697,7 +1697,11 @@ - - struct nv_ipmi_softc - { -+#if defined(ipmi_user_t) - ipmi_user_t p_user; // ptr to ipmi_msghandler user structure -+#else -+ struct ipmi_user *p_user; // ptr to ipmi_msghandler user structure -+#endif - spinlock_t msg_lock; - struct list_head msgs; - NvU32 seqNum; //request sequence number -@@ -1706,7 +1710,11 @@ - static inline int - nv_ipmi_set_my_address - ( -+#if defined(ipmi_user_t) - ipmi_user_t user, -+#else -+ struct ipmi_user *user, -+#endif - unsigned char address - ) - { ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c~ 2018-08-22 09:55:29.000000000 +0900 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2019-01-02 10:00:43.465451775 +0900 -@@ -24,6 +24,8 @@ - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) - -+#include -+ - #include "nvidia-drm-gem-nvkms-memory.h" - #include "nvidia-drm-ioctl.h" - -@@ -237,6 +237,9 @@ - - page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) -+ return vmf_insert_pfn(vma, address, pfn + page_offset); -+#else - ret = vm_insert_pfn(vma, address, pfn + page_offset); - - switch (ret) { -@@ -258,6 +258,7 @@ - } - - return VM_FAULT_SIGBUS; -+#endif - } - - /* diff --git a/kernel-4.4.169.patch b/kernel-4.4.169.patch deleted file mode 100644 index 48bf520..0000000 --- a/kernel-4.4.169.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/conftest.sh~ 2018-08-22 06:47:57.000000000 +0900 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/conftest.sh 2018-12-29 09:33:30.537541114 +0900 -@@ -2725,6 +2725,32 @@ - return - fi - -+ # Conftest #3: Check if get_user_pages has gup_flags instead of write and force parameters. -+ # Return if available. -+ # Fall through to default case if absent. -+ -+ echo "$CONFTEST_PREAMBLE -+ #include -+ long get_user_pages(struct task_struct *tsk, -+ struct mm_struct *mm, -+ unsigned long start, -+ unsigned long nr_pages, -+ unsigned int gup_flags, -+ struct page **pages, -+ struct vm_area_struct **vmas) { -+ return 0; -+ }" > conftest$$.c -+ -+ $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 -+ rm -f conftest$$.c -+ -+ if [ -f conftest$$.o ]; then -+ echo "#undef NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions" -+ echo "#define NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions" -+ rm -f conftest$$.o -+ return -+ fi -+ - echo "#define NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions" - echo "#define NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions" - ---- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/common/inc/nv-mm.h~ 2018-08-22 09:55:23.000000000 +0900 -+++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/common/inc/nv-mm.h 2018-12-29 09:30:55.797962776 +0900 -@@ -40,8 +40,31 @@ - */ - - #if defined(NV_GET_USER_PAGES_HAS_TASK_STRUCT) -+ #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS) - #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \ - get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas) -+ #else -+ #include -+ #include -+ #include -+ -+ static inline long NV_GET_USER_PAGES(unsigned long start, -+ unsigned long nr_pages, -+ int write, -+ int force, -+ struct page **pages, -+ struct vm_area_struct **vmas) -+ { -+ unsigned int flags = 0; -+ -+ if (write) -+ flags |= FOLL_WRITE; -+ if (force) -+ flags |= FOLL_FORCE; -+ -+ return get_user_pages(current, current->mm, start, nr_pages, flags, pages, vmas); -+ } -+ #endif - #else - #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS) - #define NV_GET_USER_PAGES get_user_pages diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec index b6e302e..6575009 100644 --- a/xorg-driver-video-nvidia-legacy-390xx.spec +++ b/xorg-driver-video-nvidia-legacy-390xx.spec @@ -33,31 +33,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.87 +Version: 390.116 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/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: c21fd1e9048d3cf12552a9e9035df3cf +# Source0-md5: bffe6d7e97a57bebd8bde645fb3c81bc Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: b787bc161651e5f87620fd1bfa349d4d +# Source1-md5: 2bf2f9b7dcaea8cb2c30813ab4e57f71 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-4.19.patch -Patch3: kernel-4.4.169.patch -Patch4: kernel-4.20.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.20.2}} @@ -271,9 +268,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -- 2.44.0