Date: Tuesday, January 1, 2019 @ 21:22:04 Author: eworm Revision: 342879
archrelease: copy trunk to testing-x86_64 Added: nvidia-390xx/repos/testing-x86_64/ nvidia-390xx/repos/testing-x86_64/PKGBUILD (from rev 342878, nvidia-390xx/trunk/PKGBUILD) nvidia-390xx/repos/testing-x86_64/kernel-4.16.patch (from rev 342878, nvidia-390xx/trunk/kernel-4.16.patch) nvidia-390xx/repos/testing-x86_64/kernel-4.19.patch (from rev 342878, nvidia-390xx/trunk/kernel-4.19.patch) nvidia-390xx/repos/testing-x86_64/kernel-4.20.patch (from rev 342878, nvidia-390xx/trunk/kernel-4.20.patch) -------------------+ PKGBUILD | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel-4.16.patch | 33 ++++++++++++++++++ kernel-4.19.patch | 63 ++++++++++++++++++++++++++++++++++ kernel-4.20.patch | 43 +++++++++++++++++++++++ 4 files changed, 234 insertions(+) Copied: nvidia-390xx/repos/testing-x86_64/PKGBUILD (from rev 342878, nvidia-390xx/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2019-01-01 21:22:04 UTC (rev 342879) @@ -0,0 +1,95 @@ +# 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.87 +_extramodules=extramodules-ARCH +pkgrel=25 +pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" +arch=('x86_64') +url="http://www.nvidia.com/" +makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.20' 'linux-headers<4.21') +conflicts=('nvidia') +license=('custom') +options=('!strip') +_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" + kernel-4.16.patch kernel-4.19.patch kernel-4.20.patch) +sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66' + '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385' + 'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431' + 'deb45f7636dfebe938dffe566df9e9a5deeb47ccaf0bfe16a2884579b2524075') + +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 + + # Ad-hoc patch + patch -Np1 -i ../kernel-4.19.patch + + # struct ipmi_user + patch -Np1 -i ../kernel-4.20.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() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + cd "${_pkg}"/kernel + make SYSSRC=/usr/lib/modules/"${_kernver}/build" module +} + +package_nvidia-390xx() { + pkgdesc="NVIDIA drivers for linux, 390xx legacy branch" + depends=('linux>=4.20' 'linux<4.21' "nvidia-390xx-utils=${pkgver}" 'libglvnd') + + install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -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 342878, nvidia-390xx/trunk/kernel-4.16.patch) =================================================================== --- testing-x86_64/kernel-4.16.patch (rev 0) +++ testing-x86_64/kernel-4.16.patch 2019-01-01 21:22:04 UTC (rev 342879) @@ -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-4.19.patch (from rev 342878, nvidia-390xx/trunk/kernel-4.19.patch) =================================================================== --- testing-x86_64/kernel-4.19.patch (rev 0) +++ testing-x86_64/kernel-4.19.patch 2019-01-01 21:22:04 UTC (rev 342879) @@ -0,0 +1,63 @@ +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( Copied: nvidia-390xx/repos/testing-x86_64/kernel-4.20.patch (from rev 342878, nvidia-390xx/trunk/kernel-4.20.patch) =================================================================== --- testing-x86_64/kernel-4.20.patch (rev 0) +++ testing-x86_64/kernel-4.20.patch 2019-01-01 21:22:04 UTC (rev 342879) @@ -0,0 +1,43 @@ +--- 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: