From 52e7f6c25b65bf0100c2a6f3babcc901b46fc78e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Jun 2019 14:48:10 +0100 Subject: sys-kernel/nvidia-drivers-dkms : version bump --- sys-kernel/nvidia-drivers-dkms/Manifest | 2 +- .../files/390.87-ipmi_user.patch | 37 ---------------- .../files/390.87-vmf_insert_pfn.patch | 23 ---------- .../nvidia-drivers-dkms/files/kernel-4.19.patch | 49 --------------------- .../files/nvidia-drivers-dkms-390.116-conf.patch | 28 ++++++++++++ .../files/nvidia-drivers-dkms-390.87-conf.patch | 28 ------------ .../nvidia-drivers-dkms-390.116.ebuild | 47 ++++++++++++++++++++ .../nvidia-drivers-dkms-390.87-r1.ebuild | 50 ---------------------- 8 files changed, 76 insertions(+), 188 deletions(-) delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/kernel-4.19.patch create mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch delete mode 100644 sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.116.ebuild delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87-r1.ebuild (limited to 'sys-kernel/nvidia-drivers-dkms') diff --git a/sys-kernel/nvidia-drivers-dkms/Manifest b/sys-kernel/nvidia-drivers-dkms/Manifest index 995b94fb..ee4561cb 100644 --- a/sys-kernel/nvidia-drivers-dkms/Manifest +++ b/sys-kernel/nvidia-drivers-dkms/Manifest @@ -1 +1 @@ -DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805 +DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670f461a11af28a31b07a266b633e5547751871da2cbe5753bc5f11f8a109bda50387b422984d2afff2d7284d8564edb4405421b6 SHA512 6afad9db6c56d475e34f6f4ee7a8a8351e132aab69fd3ad467a5f559a70cebda09dbd3ecfddd699b59c50903b81450b00c9197d05e149c759c2bb5d0a72d6fe8 diff --git a/sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch b/sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch deleted file mode 100644 index 36228bc4..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Nur a/kernel/nvidia/os-interface.c b/kernel/nvidia/os-interface.c ---- a/kernel/nvidia/os-interface.c 2018-08-22 01:55:22.000000000 +0100 -+++ b/kernel/nvidia/os-interface.c 2019-02-10 03:28:33.359055441 +0000 -@@ -16,6 +16,8 @@ - - #include "nv-gpu-numa.h" - -+#include -+ - #define MAX_ERROR_STRING 512 - static char nv_error_string[MAX_ERROR_STRING]; - nv_spinlock_t nv_error_string_lock; -@@ -1697,7 +1699,12 @@ - - struct nv_ipmi_softc - { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) -+ struct ipmi_user *p_user; // ptr to ipmi_msghandler user structure -+#else - ipmi_user_t p_user; // ptr to ipmi_msghandler user structure -+#endif -+ - spinlock_t msg_lock; - struct list_head msgs; - NvU32 seqNum; //request sequence number -@@ -1706,7 +1713,11 @@ - static inline int - nv_ipmi_set_my_address - ( -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) -+ struct ipmi_user *user, -+#else - ipmi_user_t user, -+#endif - unsigned char address - ) - { diff --git a/sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch b/sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch deleted file mode 100644 index 63052b57..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c ---- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2018-08-22 01:55:29.000000000 +0100 -+++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2019-02-10 03:22:49.318034507 +0000 -@@ -29,6 +29,7 @@ - - #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; -@@ -237,7 +238,11 @@ - - page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) -+ ret = vmf_insert_pfn(vma, address, pfn + page_offset); -+#else - ret = vm_insert_pfn(vma, address, pfn + page_offset); -+#endif - - switch (ret) { - case 0: diff --git a/sys-kernel/nvidia-drivers-dkms/files/kernel-4.19.patch b/sys-kernel/nvidia-drivers-dkms/files/kernel-4.19.patch deleted file mode 100644 index 4abcba4a..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/kernel-4.19.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naru 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-10-23 07:58:50.447742183 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-10-23 08:00:13.927741400 +0200 -@@ -35,6 +35,8 @@ - #include - #include - -+#include -+ - static void nv_drm_connector_destroy(struct drm_connector *connector) - { - struct nv_drm_connector *nv_connector = to_nv_connector(connector); -@@ -226,7 +228,11 @@ - - - if (nv_connector->edid != NULL) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) -+ drm_connector_update_edid_property( -+#else - drm_mode_connector_update_edid_property( -+#endif - connector, nv_connector->edid); - } - -diff -Naru kernel.orig/nvidia-drm/nvidia-drm-encoder.c kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-10-23 07:58:50.447742183 +0200 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-10-23 08:01:21.587740766 +0200 -@@ -35,6 +35,8 @@ - #include - #include - -+#include -+ - static void nv_drm_encoder_destroy(struct drm_encoder *encoder) - { - struct nv_drm_encoder *nv_encoder = to_nv_encoder(encoder); -@@ -215,8 +217,11 @@ - } - - /* Attach encoder and connector */ -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) -+ ret = drm_connector_attach_encoder(connector, encoder); -+#else - ret = drm_mode_connector_attach_encoder(connector, encoder); -+#endif - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch new file mode 100644 index 00000000..39736f59 --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.116-conf.patch @@ -0,0 +1,28 @@ +diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf +--- a/kernel/dkms.conf 2018-03-22 05:39:53.000000000 +0000 ++++ b/kernel/dkms.conf 2018-04-09 16:18:23.177125417 +0100 +@@ -1,12 +1,20 @@ +-PACKAGE_NAME="nvidia" +-PACKAGE_VERSION="__VERSION_STRING" ++PACKAGE_NAME="nvidia-drivers-dkms" ++PACKAGE_VERSION="390.116" + AUTOINSTALL="yes" + + # By default, DKMS will add KERNELRELEASE to the make command line; however, + # this will cause the kernel module build to infer that it was invoked via + # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting + # the 'make' command name to suppress this behavior. +-MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" ++MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" + + # The list of kernel modules will be generated by nvidia-installer at runtime. +-__DKMS_MODULES ++BUILT_MODULE_NAME[0]="nvidia" ++DEST_MODULE_LOCATION[0]="/extra/dkms" ++BUILT_MODULE_NAME[1]="nvidia-uvm" ++DEST_MODULE_LOCATION[1]="/extra/dkms" ++BUILT_MODULE_NAME[2]="nvidia-modeset" ++DEST_MODULE_LOCATION[2]="/extra/dkms" ++BUILT_MODULE_NAME[3]="nvidia-drm" ++DEST_MODULE_LOCATION[3]="/extra/dkms" ++ diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch deleted file mode 100644 index 06fc058d..00000000 --- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-390.87-conf.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf ---- a/kernel/dkms.conf 2018-03-22 05:39:53.000000000 +0000 -+++ b/kernel/dkms.conf 2018-04-09 16:18:23.177125417 +0100 -@@ -1,12 +1,20 @@ --PACKAGE_NAME="nvidia" --PACKAGE_VERSION="__VERSION_STRING" -+PACKAGE_NAME="nvidia-drivers-dkms" -+PACKAGE_VERSION="390.87" - AUTOINSTALL="yes" - - # By default, DKMS will add KERNELRELEASE to the make command line; however, - # this will cause the kernel module build to infer that it was invoked via - # Kbuild directly instead of DKMS. The dkms(8) manual page recommends quoting - # the 'make' command name to suppress this behavior. --MAKE[0]="'make' -j__JOBS NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" -+MAKE[0]="'make' -j`nproc` NV_EXCLUDE_BUILD_MODULES='__EXCLUDE_MODULES' KERNEL_UNAME=${kernelver} modules" - - # The list of kernel modules will be generated by nvidia-installer at runtime. --__DKMS_MODULES -+BUILT_MODULE_NAME[0]="nvidia" -+DEST_MODULE_LOCATION[0]="/extra/dkms" -+BUILT_MODULE_NAME[1]="nvidia-uvm" -+DEST_MODULE_LOCATION[1]="/extra/dkms" -+BUILT_MODULE_NAME[2]="nvidia-modeset" -+DEST_MODULE_LOCATION[2]="/extra/dkms" -+BUILT_MODULE_NAME[3]="nvidia-drm" -+DEST_MODULE_LOCATION[3]="/extra/dkms" -+ diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.116.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.116.ebuild new file mode 100644 index 00000000..89e20038 --- /dev/null +++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.116.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils + +NV_URI="http://us.download.nvidia.com/XFree86/" +AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" + +DESCRIPTION="NVIDIA driver sources for linux" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" + +LICENSE="GPL-2 NVIDIA-r2" +SLOT="0/${PV}" +KEYWORDS="amd64" +IUSE="" + +DEPEND="sys-kernel/dkms" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/kernel-4.16.patch + "${FILESDIR}"/"${P}"-conf.patch +) + +S="${WORKDIR}/${AMD64_NV_PACKAGE}" + +src_unpack() { + sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only +} + +src_install() { + dodir usr/src/${P} + insinto usr/src/${P} + doins -r "${S}"/kernel/* +} + +pkg_postinst() { + dkms add ${PN}/${PV} +} + +pkg_prerm() { + dkms remove ${PN}/${PV} --all +} diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87-r1.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87-r1.ebuild deleted file mode 100644 index d9efede1..00000000 --- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils - -NV_URI="http://us.download.nvidia.com/XFree86/" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" - -DESCRIPTION="NVIDIA driver sources for linux" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )" - -LICENSE="GPL-2 NVIDIA-r2" -SLOT="0/${PV}" -KEYWORDS="amd64" -IUSE="" - -DEPEND="sys-kernel/dkms" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/kernel-4.16.patch - "${FILESDIR}"/kernel-4.19.patch - "${FILESDIR}"/"${P}"-conf.patch - "${FILESDIR}"/"${PV}"-vmf_insert_pfn.patch - "${FILESDIR}"/"${PV}"-ipmi_user.patch -) - -S="${WORKDIR}/${AMD64_NV_PACKAGE}" - -src_unpack() { - sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only -} - -src_install() { - dodir usr/src/${P} - insinto usr/src/${P} - doins -r "${S}"/kernel/* -} - -pkg_postinst() { - dkms add ${PN}/${PV} -} - -pkg_prerm() { - dkms remove ${PN}/${PV} --all -} -- cgit v1.2.3