x11-drivers/nvidia-drivers : version bump

6 files changed, 5 insertions, 117 deletions

diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 995b94fb..ee4561cb 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/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/x11-drivers/nvidia-drivers/files/390.87-ipmi_user.patch b/x11-drivers/nvidia-drivers/files/390.87-ipmi_user.patch
deleted file mode 100644
index 36228bc4..00000000
--- a/x11-drivers/nvidia-drivers/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 <linux/version.h>
-+
- #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/x11-drivers/nvidia-drivers/files/390.87-vmf_insert_pfn.patch b/x11-drivers/nvidia-drivers/files/390.87-vmf_insert_pfn.patch
deleted file mode 100644
index 63052b57..00000000
--- a/x11-drivers/nvidia-drivers/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 <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;
-@@ -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/x11-drivers/nvidia-drivers/files/kernel-4.19.patch b/x11-drivers/nvidia-drivers/files/kernel-4.19.patch
deleted file mode 100644
index 4abcba4a..00000000
--- a/x11-drivers/nvidia-drivers/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 <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
- 
-+#include <linux/version.h>
-+
- 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 <drm/drm_atomic.h>
- #include <drm/drm_atomic_helper.h>
- 
-+#include <linux/version.h>
-+
- 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/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.87-conf.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.116-conf.patch
index 06fc058d..39736f59 100644
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.87-conf.patch
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.116-conf.patch
@@ -5,7 +5,7 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
 -PACKAGE_NAME="nvidia"
 -PACKAGE_VERSION="__VERSION_STRING"
 +PACKAGE_NAME="nvidia-drivers-dkms"
-+PACKAGE_VERSION="390.87"
++PACKAGE_VERSION="390.116"
  AUTOINSTALL="yes"
  
  # By default, DKMS will add KERNELRELEASE to the make command line; however,
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.116.ebuild
index ae762032..fa8b8be0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.116.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
 SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
 
 LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV}"
+SLOT="0/390116"
 KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
@@ -27,11 +27,11 @@ COMMON="
 	)"
 DEPEND="${COMMON}"
 PDEPEND="
-	tools? ( x11-misc/nvidia-settings )"
+	tools? ( x11-misc/nvidia-settings:${SLOT} )"
 RDEPEND="
 	${COMMON}
 	acpi? ( sys-power/acpid )
-	dkms? ( ~sys-kernel/${PN}-dkms-${PV} )
+	dkms? ( sys-kernel/${PN}-dkms:${SLOT} )
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	X? (
 		<x11-base/xorg-server-1.20.99:=
@@ -46,10 +46,7 @@ QA_PREBUILT="opt/* usr/lib*"
 
 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}/