From: Jan Palus Date: Thu, 22 Aug 2019 20:32:12 +0000 (+0200) Subject: up to 390.129 X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-390xx-390.129-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-390xx.git;a=commitdiff_plain;h=a109907 up to 390.129 --- diff --git a/kernel-5.1-x8664.patch b/kernel-5.1-x8664.patch deleted file mode 100644 index 5ec95f2..0000000 --- a/kernel-5.1-x8664.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8.c.orig 2019-01-27 17:12:22.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8.c 2019-05-07 20:36:42.676844249 +0200 -@@ -166,13 +166,21 @@ - // If a fault handler is not set, paths like handle_pte_fault in older kernels - // assume the memory is anonymous. That would make debugging this failure harder - // so we force it to fail instead. -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+static vm_fault_t uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf) -+#else - static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf) -+#endif - { - UVM_DBG_PRINT_RL("Fault to address 0x%lx in disabled vma\n", nv_page_fault_va(vmf)); - return VM_FAULT_SIGBUS; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+static vm_fault_t uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf) -+#else - static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf) -+#endif - { - #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG) - return uvm_vm_fault_sigbus(vmf->vma, vmf); -@@ -507,7 +515,11 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+static vm_fault_t uvm_vm_fault_wrapper(struct vm_fault *vmf) -+#else - static int uvm_vm_fault_wrapper(struct vm_fault *vmf) -+#endif - { - #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG) - return uvm_vm_fault(vmf->vma, vmf); diff --git a/kernel-5.1.patch b/kernel-5.1.patch deleted file mode 100644 index bc8eee0..0000000 --- a/kernel-5.1.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/common/inc/nv-list-helpers.h~ 2019-01-27 17:12:19.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/common/inc/nv-list-helpers.h 2019-05-07 19:39:34.895403211 +0200 -@@ -23,6 +23,7 @@ - #ifndef __NV_LIST_HELPERS_H__ - #define __NV_LIST_HELPERS_H__ - -+#include - #include - #include "conftest.h" - -@@ -91,10 +91,12 @@ - list_entry((pos)->member.next, typeof(*(pos)), member) - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - static inline int list_is_first(const struct list_head *list, - const struct list_head *head) - { - return list->prev == head; - } -+#endif - - #endif // __NV_LIST_HELPERS_H__ ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c.orig 2019-01-27 17:12:27.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-drv.c 2019-05-07 20:39:24.748960946 +0200 -@@ -55,6 +55,11 @@ - #include - #endif - -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+#include -+#endif -+ - static struct nv_drm_device *dev_list = NULL; - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c~ 2019-01-27 17:12:27.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-encoder.c 2019-05-07 20:42:06.361103325 +0200 -@@ -36,6 +36,11 @@ - #include - #include - -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+#include -+#endif -+ - static void nv_drm_encoder_destroy(struct drm_encoder *encoder) - { - struct nv_drm_encoder *nv_encoder = to_nv_encoder(encoder); ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c~ 2019-01-27 17:12:27.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-connector.c 2019-05-07 20:43:20.487229513 +0200 -@@ -35,6 +35,11 @@ - #include - #include - -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+#include -+#endif -+ - static void nv_drm_connector_destroy(struct drm_connector *connector) - { - struct nv_drm_connector *nv_connector = to_nv_connector(connector); ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c~ 2019-01-27 17:12:27.000000000 +0100 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2019-05-07 20:45:43.466195062 +0200 -@@ -19,6 +19,7 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+#include - - #include "nvidia-drm-conftest.h" - -@@ -268,12 +268,20 @@ - */ - - #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf) -+#else - static int nv_drm_vma_fault(struct vm_fault *vmf) -+#endif - { - return __nv_drm_vma_fault(vmf->vma, vmf); - } - #else -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) -+static vm_fault_t nv_drm_vma_fault(struct vm_area_struct *vma, -+#else - static int nv_drm_vma_fault(struct vm_area_struct *vma, -+#endif - struct vm_fault *vmf) - { - return __nv_drm_vma_fault(vma, vmf); diff --git a/kernel-5.2.patch b/kernel-5.2.patch deleted file mode 100644 index 22f3b99..0000000 --- a/kernel-5.2.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8_tools.c~ 2019-01-28 00:12:22.000000000 +0800 -+++ NVIDIA-Linux-x86_64-390.116-no-compat32/kernel/nvidia-uvm/uvm8_tools.c 2019-07-12 21:57:52.529905949 +0800 -@@ -204,7 +204,7 @@ - return event_tracker != NULL && !event_tracker->is_queue; - } - --static void put_user_pages(struct page **pages, NvU64 page_count) -+static void nv_put_user_pages(struct page **pages, NvU64 page_count) - { - NvU64 i; - for (i = 0; i < page_count; i++) -@@ -215,7 +215,7 @@ - { - size = DIV_ROUND_UP(size, PAGE_SIZE); - vunmap((NvU8 *)addr); -- put_user_pages(pages, size); -+ nv_put_user_pages(pages, size); - uvm_kvfree(pages); - } - -@@ -279,7 +279,7 @@ - uvm_kvfree(vmas); - - if (ret > 0) -- put_user_pages(*pages, ret); -+ nv_put_user_pages(*pages, ret); - else if (ret < 0) - status = errno_to_nv_status(ret); - diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec index 515da46..19a42bf 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.116 +Version: 390.129 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: bffe6d7e97a57bebd8bde645fb3c81bc +# Source0-md5: 763f9789e0fe1a76031211d0fb58fc4f Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 2bf2f9b7dcaea8cb2c30813ab4e57f71 +# Source1-md5: f3659b1603ba3e421d05c8e744dc3a5a 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.1.patch -Patch3: kernel-5.1-x8664.patch -Patch4: kernel-5.2.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,11 +268,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%ifarch %{x8664} -%patch3 -p1 -%patch4 -p1 -%endif echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build