summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-02-10 02:29:56 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-02-10 02:29:56 +0000
commitb0d0c1c98c65f2701a0e28fef938fe4beab49058 (patch)
tree0a17182caaed0958d4babb0d27e698f5ed8a538c
parent25a09bbfade3d998caa3dcbaf2afefd5449e46d6 (diff)
x11-drivers/nvidia-drivers-dkms : add kernel 4.20 patches
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch20
-rw-r--r--sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch11
-rw-r--r--sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild6
3 files changed, 35 insertions, 2 deletions
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
new file mode 100644
index 00000000..03aa4287
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/390.87-ipmi_user.patch
@@ -0,0 +1,20 @@
+--- a/kernel/nvidia/os-interface.c 2018-12-27 11:57:21.788109696 +1100
++++ b/kernel/nvidia/os-interface.c 2018-12-27 11:59:45.300394369 +1100
+@@ -1697,7 +1697,7 @@
+
+ struct nv_ipmi_softc
+ {
+- ipmi_user_t p_user; // ptr to ipmi_msghandler user structure
++ struct ipmi_user *p_user; // ptr to ipmi_msghandler user structure
+ spinlock_t msg_lock;
+ struct list_head msgs;
+ NvU32 seqNum; //request sequence number
+@@ -1706,7 +1706,7 @@
+ static inline int
+ nv_ipmi_set_my_address
+ (
+- ipmi_user_t user,
++ struct ipmi_user *user,
+ unsigned char address
+ )
+ { \ No newline at end of file
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
new file mode 100644
index 00000000..b78bff28
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/files/390.87-vmf_insert_pfn.patch
@@ -0,0 +1,11 @@
+--- a/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2018-12-27 12:02:01.534608650 +1100
++++ b/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c 2018-12-27 12:04:31.541940558 +1100
+@@ -237,7 +237,7 @@
+
+ page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
+
+- ret = vm_insert_pfn(vma, address, pfn + page_offset);
++ ret = vmf_insert_pfn(vma, address, pfn + page_offset);
+
+ switch (ret) {
+ case 0: \ No newline at end of file
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild
index ee5bf2ae..b2446948 100644
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-390.87.ebuild
@@ -28,8 +28,10 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}/kernel-4.16.patch"
- epatch ""${FILESDIR}"/"${P}"-conf.patch"
+ epatch "${FILESDIR}"/kernel-4.16.patch
+ epatch "${FILESDIR}"/"${P}"-conf.patch
+ epatch "${FILESDIR}"/"${PV}"-vmf_insert_pfn.patch
+ epatch "${FILESDIR}"/"${PV}"-ipmi_user.patch
}
src_install() {