diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | kernel-4.19.patch | 63 | ||||
| -rw-r--r-- | kernel-4.20.patch | 43 |
4 files changed, 12 insertions, 130 deletions
@@ -1,33 +1,29 @@ # Generated by mksrcinfo v8 -# Sat Feb 23 19:32:58 UTC 2019 +# Sat Feb 23 22:45:45 UTC 2019 pkgbase = nvidia-390xx-ck pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch. - pkgver = 390.87 - pkgrel = 20 + pkgver = 390.116 + pkgrel = 1 url = http://www.nvidia.com/ arch = x86_64 license = custom - makedepends = nvidia-390xx-utils=390.87 + makedepends = nvidia-390xx-utils=390.116 makedepends = libglvnd makedepends = linux-ck-headers>=4.20 makedepends = linux-ck-headers<4.21 depends = linux-ck>=4.20 depends = linux-ck<4.21 depends = libglvnd - depends = nvidia-390xx-utils=390.87 + depends = nvidia-390xx-utils=390.116 conflicts = nvidia-340xx-ck conflicts = nvidia-ck options = !strip - source = http://us.download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87-no-compat32.run + source = http://us.download.nvidia.com/XFree86/Linux-x86_64/390.116/NVIDIA-Linux-x86_64-390.116-no-compat32.run source = kernel-4.16.patch - source = kernel-4.19.patch source = unfuck.patch - source = kernel-4.20.patch - sha256sums = c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66 + sha256sums = de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385 - sha256sums = e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431 sha256sums = fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080 - sha256sums = deb45f7636dfebe938dffe566df9e9a5deeb47ccaf0bfe16a2884579b2524075 pkgname = nvidia-390xx-ck @@ -3,8 +3,8 @@ # Contrubutor: Thomas Baechler <thomas@archlinux.org> pkgname=nvidia-390xx-ck -pkgver=390.87 -pkgrel=20 +pkgver=390.116 +pkgrel=1 _extramodules=extramodules-ck _pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch." pkgdesc="$_pkgdesc" @@ -18,12 +18,10 @@ conflicts=('nvidia-340xx-ck' 'nvidia-ck') license=('custom') options=('!strip') source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" -kernel-4.16.patch kernel-4.19.patch unfuck.patch kernel-4.20.patch) -sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66' +kernel-4.16.patch unfuck.patch) +sha256sums=('de85a2eea39ca16e25645b345259b01fbe858b833286b7e6785afa273009ef6f' '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385' - 'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431' - 'fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080' - 'deb45f7636dfebe938dffe566df9e9a5deeb47ccaf0bfe16a2884579b2524075') + 'fa726a12083bd7415d4f827652caf66030224c8e69925aa9f650766e58790080') _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -35,12 +33,6 @@ prepare() { # https://bugs.archlinux.org/task/58074 patch -Np1 -i ../kernel-4.16.patch - # Ad-hoc patch - patch -Np1 -i ../kernel-4.19.patch - - # struct ipmi_user - patch -Np1 -i ../kernel-4.20.patch - # https://bugs.archlinux.org/task/59199 patch -Np1 -i ../unfuck.patch } diff --git a/kernel-4.19.patch b/kernel-4.19.patch deleted file mode 100644 index 57a7259e9650..000000000000 --- a/kernel-4.19.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh ---- a/kernel/conftest.sh 2018-11-01 11:00:14.429126159 +0000 -+++ b/kernel/conftest.sh 2018-11-01 11:03:08.199579458 +0000 -@@ -2372,8 +2372,13 @@ - # - CODE=" - #include <drm/drmP.h> -+ #include <linux/version.h> - void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) { -+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) - drm_mode_connector_list_update( -+ #else -+ drm_connector_list_update( -+ #endif - NULL, /* struct drm_connector *connector */ - true); /* bool merge_type_bits */ - }" -diff -u -r a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-08-22 00:55:29.000000000 +0000 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-11-01 11:08:14.643715031 +0000 -@@ -34,6 +34,7 @@ - - #include <drm/drm_atomic.h> - #include <drm/drm_atomic_helper.h> -+#include <linux/version.h> - - static void nv_drm_connector_destroy(struct drm_connector *connector) - { -@@ -226,7 +227,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 -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-08-22 00:55:29.000000000 +0000 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-11-01 11:08:32.210427737 +0000 -@@ -34,6 +34,7 @@ - - #include <drm/drm_atomic.h> - #include <drm/drm_atomic_helper.h> -+#include <linux/version.h> - - static void nv_drm_encoder_destroy(struct drm_encoder *encoder) - { -@@ -216,7 +217,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( diff --git a/kernel-4.20.patch b/kernel-4.20.patch deleted file mode 100644 index 7548fec4fad7..000000000000 --- a/kernel-4.20.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/kernel/nvidia/os-interface.c -+++ b/kernel/nvidia/os-interface.c -@@ -1670,7 +1670,7 @@ - - struct nv_ipmi_softc - { -- ipmi_user_t p_user; // ptr to ipmi_msghandler user structure -+ struct ipmi_user *p_user; - spinlock_t msg_lock; - struct list_head msgs; - NvU32 seqNum; //request sequence number -@@ -1679,7 +1679,7 @@ - static inline int - nv_ipmi_set_my_address - ( -- ipmi_user_t user, -+ struct ipmi_user *user, - unsigned char address - ) - { ---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c -+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c -@@ -20,6 +20,8 @@ - * DEALINGS IN THE SOFTWARE. - */ - -+#include <linux/version.h> -+ - #include "nvidia-drm-conftest.h" - - #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) -@@ -345,7 +347,11 @@ static int __nv_drm_vma_fault(struct vm_area_struct *vma, - - page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node); - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) - ret = vm_insert_pfn(vma, address, pfn + page_offset); -+#else -+ ret = vmf_insert_pfn(vma, address, pfn + page_offset); -+#endif - - switch (ret) { - case 0: |