Date: Thursday, January 23, 2020 @ 11:25:31 Author: heftig Revision: 373839
archrelease: copy trunk to testing-x86_64 Added: nvidia-390xx/repos/testing-x86_64/ nvidia-390xx/repos/testing-x86_64/PKGBUILD (from rev 373833, nvidia-390xx/trunk/PKGBUILD) nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch (from rev 373834, nvidia-390xx/trunk/kernel-4.16.patch) nvidia-390xx/repos/testing-x86_64/kernel-5.1.patch (from rev 373834, nvidia-390xx/trunk/kernel-5.1.patch) nvidia-390xx/repos/testing-x86_64/kernel-5.2.patch (from rev 373834, nvidia-390xx/trunk/kernel-5.2.patch) -------------------+ PKGBUILD | 86 ++++++++++++++++++++++++++++++++++ kernel-4.16.patch | 33 +++++++++++++ kernel-5.1.patch | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel-5.2.patch | 18 +++++++ 4 files changed, 267 insertions(+) Copied: nvidia-390xx/repos/testing-x86_64/PKGBUILD (from rev 373833, nvidia-390xx/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2020-01-23 11:25:31 UTC (rev 373839) @@ -0,0 +1,86 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> + +pkgbase=nvidia-390xx +pkgname=(nvidia-390xx nvidia-390xx-dkms) +pkgver=390.132 +pkgrel=19 +pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" +arch=('x86_64') +url="https://www.nvidia.com/" +makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux-headers') +conflicts=('nvidia') +license=('custom') +options=('!strip') +_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" + 'kernel-4.16.patch') +sha256sums=('b6b4b8af37e78e026c9ebdf4a5c64ea412dfcb710931dd028c22dac228de659d' + '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385') + +prepare() { + sh "${_pkg}.run" --extract-only + cd "${_pkg}" + + # Restore phys_to_dma support (still needed for 396.18) + # https://bugs.archlinux.org/task/58074 + patch -Np1 -i ../kernel-4.16.patch + + cp -a kernel kernel-dkms + cd kernel-dkms + sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf + sed -i 's/__JOBS/`nproc`/' dkms.conf + sed -i 's/__DKMS_MODULES//' dkms.conf + sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\ +DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[1]="nvidia-uvm"\ +DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[2]="nvidia-modeset"\ +DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\ +BUILT_MODULE_NAME[3]="nvidia-drm"\ +DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf + + # Gift for linux-rt guys + sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf +} + +build() { + cd "${_pkg}"/kernel + make SYSSRC=/usr/src/linux module +} + +package_nvidia-390xx() { + pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" + depends=('linux' "nvidia-390xx-utils=${pkgver}" 'libglvnd') + + _extradir="/usr/lib/modules/$(</usr/src/linux/version)/extramodules" + install -Dt "${pkgdir}${_extradir}" -m644 \ + "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko + + find "${pkgdir}" -name '*.ko' -exec gzip -n {} + + + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" +} + +package_nvidia-390xx-dkms() { + pkgdesc="NVIDIA driver sources for linux, 390xx legacy branch" + depends=('dkms' "nvidia-390xx-utils=$pkgver" 'libglvnd') + optdepends=('linux-headers: Build the module for Arch kernel' + 'linux-lts-headers: Build the module for LTS Arch kernel') + provides=("nvidia-390xx=$pkgver") + conflicts+=('nvidia-390xx') + + cd ${_pkg} + + install -dm 755 "${pkgdir}"/usr/src + cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}" + + echo "blacklist nouveau" | + install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" + + install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE" +} Copied: nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch (from rev 373834, nvidia-390xx/trunk/kernel-4.16.patch) =================================================================== --- testing-x86_64/kernel-4.16.patch (rev 0) +++ testing-x86_64/kernel-4.16.patch 2020-01-23 11:25:31 UTC (rev 373839) @@ -0,0 +1,33 @@ +diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h +index 10fc418..22ef968 100644 +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h +@@ -175,7 +175,11 @@ static inline uid_t __kuid_val(kuid_t uid) + + #if defined(NV_VM_INSERT_PAGE_PRESENT) + #include <linux/pagemap.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++#include <linux/dma-direct.h> ++#endif + #endif + + #if defined(CONFIG_SWIOTLB) && defined(NVCPU_AARCH64) +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index b23dbb4..42dc576 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1906,7 +1906,12 @@ compile_test() { + # Determine if the phys_to_dma function is present. + # + CODE=" ++ #include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) + #include <linux/dma-mapping.h> ++#else ++ #include <linux/dma-direct.h> ++#endif + void conftest_phys_to_dma(void) { + phys_to_dma(); + }" Copied: nvidia-390xx/repos/testing-x86_64/kernel-5.1.patch (from rev 373834, nvidia-390xx/trunk/kernel-5.1.patch) =================================================================== --- testing-x86_64/kernel-5.1.patch (rev 0) +++ testing-x86_64/kernel-5.1.patch 2020-01-23 11:25:31 UTC (rev 373839) @@ -0,0 +1,130 @@ +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 <linux/list.h> + #include "conftest.h" + ++#include <linux/version.h> ++ + #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 <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + #include <drm/drm_crtc_helper.h> ++#else ++#include <drm/drm_probe_helper.h> ++#endif + + #include <drm/drm_atomic.h> + #include <drm/drm_atomic_helper.h> +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 <drm/drmP.h> + ++#include <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + #include <drm/drm_crtc_helper.h> ++#else ++#include <drm/drm_probe_helper.h> ++#endif + + #if defined(NV_DRM_DRM_GEM_H_PRESENT) + #include <drm/drm_gem.h> +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 <linux/version.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) + #include <drm/drm_crtc_helper.h> ++#else ++#include <drm/drm_probe_helper.h> ++#endif + + #include <drm/drm_atomic.h> + #include <drm/drm_atomic_helper.h> +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 <linux/version.h> ++ + 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/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); Copied: nvidia-390xx/repos/testing-x86_64/kernel-5.2.patch (from rev 373834, nvidia-390xx/trunk/kernel-5.2.patch) =================================================================== --- testing-x86_64/kernel-5.2.patch (rev 0) +++ testing-x86_64/kernel-5.2.patch 2020-01-23 11:25:31 UTC (rev 373839) @@ -0,0 +1,18 @@ +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) + {