From 7eb492e478b399fb870c737747970ac902b78b45 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Wed, 18 Sep 2019 17:29:19 -0500 Subject: [PATCH] nvidia390: update to 390.129. Reluctantly take ownership. --- common/shlibs | 2 +- .../nvidia390/files/kernel-5.1-x86_64.patch | 29 ----- srcpkgs/nvidia390/files/kernel-5.1.patch | 102 ------------------ .../nvidia390/files/kernel-5.2-x86_64.patch | 18 ---- srcpkgs/nvidia390/template | 21 +--- 5 files changed, 6 insertions(+), 166 deletions(-) delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch delete mode 100644 srcpkgs/nvidia390/files/kernel-5.1.patch delete mode 100644 srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch diff --git a/common/shlibs b/common/shlibs index b5b6086d24f..2318c96a488 100644 --- a/common/shlibs +++ b/common/shlibs @@ -146,7 +146,7 @@ libnvidia-gtk3.so.346.47 nvidia-gtklibs-346.47_1 ignore libnvidia-glcore.so.346.47 nvidia340-libs-340.46_1 ignore libnvidia-glcore.so.390.87 nvidia390-libs-390.87_1 ignore libnvidia-glsi.so.346.72 nvidia-libs-346.72_1 ignore -libnvidia-fatbinaryloader.so.390.116 nvidia390-libs-390.116_1 ignore +libnvidia-fatbinaryloader.so.390.129 nvidia390-libs-390.129_1 ignore libnvidia-fatbinaryloader.so.430.40 nvidia-libs-430.40_1 ignore libglapi.so.0 libglapi-7.11_1 libgbm.so.1 libgbm-9.0_1 diff --git a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch deleted file mode 100644 index 04af7cc80dd..00000000000 --- a/srcpkgs/nvidia390/files/kernel-5.1-x86_64.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c -index e00923d..2e01e3c 100644 ---- a/kernel/nvidia-uvm/uvm8.c -+++ b/kernel/nvidia-uvm/uvm8.c -@@ -172,7 +172,11 @@ static int uvm_vm_fault_sigbus(struct vm_area_struct *vma, struct vm_fault *vmf) - return VM_FAULT_SIGBUS; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - static int uvm_vm_fault_sigbus_wrapper(struct vm_fault *vmf) -+#else -+static vm_fault_t 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 +511,11 @@ convert_error: - } - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - static int uvm_vm_fault_wrapper(struct vm_fault *vmf) -+#else -+static vm_fault_t 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/srcpkgs/nvidia390/files/kernel-5.1.patch b/srcpkgs/nvidia390/files/kernel-5.1.patch deleted file mode 100644 index 19d891c27b0..00000000000 --- a/srcpkgs/nvidia390/files/kernel-5.1.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff --git a/kernel/common/inc/nv-list-helpers.h b/kernel/common/inc/nv-list-helpers.h -index 0aed851..d6304c9 100644 ---- a/kernel/common/inc/nv-list-helpers.h -+++ b/kernel/common/inc/nv-list-helpers.h -@@ -26,6 +26,8 @@ - #include - #include "conftest.h" - -+#include -+ - #if !defined (list_for_each) - #define list_for_each(pos, head) \ - for (pos = (head)->next; pos != (head); pos = (pos)->next) -@@ -91,10 +93,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__ -diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c -index 24631c0..ba1497c 100644 ---- a/kernel/nvidia-drm/nvidia-drm-connector.c -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c -@@ -30,7 +30,12 @@ - #include "nvidia-drm-utils.h" - #include "nvidia-drm-encoder.h" - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - #include -+#else -+#include -+#endif - - #include - #include -diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c -index 1c2db68..d524d51 100644 ---- a/kernel/nvidia-drm/nvidia-drm-drv.c -+++ b/kernel/nvidia-drm/nvidia-drm-drv.c -@@ -41,7 +41,12 @@ - - #include - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - #include -+#else -+#include -+#endif - - #if defined(NV_DRM_DRM_GEM_H_PRESENT) - #include -diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c -index f66bbd7..df38042 100644 ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c -@@ -31,7 +31,12 @@ - #include "nvidia-drm-crtc.h" - #include "nvidia-drm-helper.h" - -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - #include -+#else -+#include -+#endif - - #include - #include -diff --git a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c -index 8636eff..fd0c8da 100644 ---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c -@@ -29,6 +29,8 @@ - - #include "nv-mm.h" - -+#include -+ - static void __nv_drm_gem_nvkms_memory_free(struct nv_drm_gem_object *nv_gem) - { - struct nv_drm_device *nv_dev = nv_gem->nv_dev; -@@ -268,7 +270,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma, - */ - - #if defined(NV_VM_OPS_FAULT_REMOVED_VMA_ARG) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) - static int nv_drm_vma_fault(struct vm_fault *vmf) -+#else -+static vm_fault_t nv_drm_vma_fault(struct vm_fault *vmf) -+#endif - { - return __nv_drm_vma_fault(vmf->vma, vmf); - } diff --git a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch b/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch deleted file mode 100644 index 344771d27d8..00000000000 --- a/srcpkgs/nvidia390/files/kernel-5.2-x86_64.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -u -r a/kernel/nvidia-uvm/uvm8_tools.c b/kernel/nvidia-uvm/uvm8_tools.c ---- a/kernel/nvidia-uvm/uvm8_tools.c 2019-01-27 16:12:22.000000000 +0000 -+++ b/kernel/nvidia-uvm/uvm8_tools.c 2019-07-09 04:42:40.134899491 +0000 -@@ -204,12 +204,14 @@ - return event_tracker != NULL && !event_tracker->is_queue; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) - static void put_user_pages(struct page **pages, NvU64 page_count) - { - NvU64 i; - for (i = 0; i < page_count; i++) - put_page(pages[i]); - } -+#endif - - static void unmap_user_pages(struct page **pages, void *addr, NvU64 size) - { diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template index c667dd0cd6a..32ce73d4354 100644 --- a/srcpkgs/nvidia390/template +++ b/srcpkgs/nvidia390/template @@ -3,9 +3,9 @@ _desc="NVIDIA drivers (GeForce 400, 500 series)" pkgname=nvidia390 -version=390.116 -revision=3 -maintainer="Orphaned " +version=390.129 +revision=1 +maintainer="Andrew Benson " license="Proprietary NVIDIA license" homepage="http://www.nvidia.com" @@ -24,11 +24,11 @@ build_options_default="glvnd" if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" - checksum=13133f07e8c733eeca9f78decbcd17754f37f84b9038c8b235f9e89b52fc5b29 + checksum=5854268c26f112a16c6fd7ded0031bf95cc8f4dab617ac5d701090fec19d6f36 else _pkg="NVIDIA-Linux-x86_64-${version}-no-compat32" distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run" - checksum=de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f + checksum=a7925a327cab828d1eb9e74f8943623c5dbc9a5e376a4c0184065d4a319696c1 fi subpackages="nvidia390-gtklibs nvidia390-dkms nvidia390-opencl nvidia390-libs" @@ -40,17 +40,6 @@ do_extract() { rm -f ${_pkg}.run } -do_patch() { - cd ${_pkg} - patch -p1 < ${FILESDIR}/kernel-5.1.patch - case "$XBPS_TARGET_MACHINE" in - x86_64) - patch -p1 < ${FILESDIR}/kernel-5.1-x86_64.patch - patch -p1 < ${FILESDIR}/kernel-5.2-x86_64.patch - ;; - esac -} - pre_install() { cd ${_pkg} cp nvidia_icd.json.template nvidia_icd.json