[arch-commits] Commit in nvidia-390xx/trunk (PKGBUILD kernel-4.20.patch)

[Christian Hesse]

    Date: Thursday, December 27, 2018 @ 21:47:55
  Author: eworm
Revision: 342766

upgpkg: nvidia-390xx 390.87-24

rebuilt for linux 4.20

Added:
  nvidia-390xx/trunk/kernel-4.20.patch
Modified:
  nvidia-390xx/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   12 ++++++++----
 kernel-4.20.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-27 17:35:56 UTC (rev 342765)
+++ PKGBUILD	2018-12-27 21:47:55 UTC (rev 342766)
@@ -6,20 +6,21 @@
 pkgname=(nvidia-390xx nvidia-390xx-dkms)
 pkgver=390.87
 _extramodules=extramodules-ARCH
-pkgrel=23
+pkgrel=24
 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.19' 'linux-headers<4.20')
+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.16.patch kernel-4.19.patch kernel-4.20.patch)
 sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
             '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
-            'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431')
+            'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431'
+            'deb45f7636dfebe938dffe566df9e9a5deeb47ccaf0bfe16a2884579b2524075')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
@@ -32,6 +33,9 @@
     # 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

Added: kernel-4.20.patch
===================================================================
--- kernel-4.20.patch	                        (rev 0)
+++ kernel-4.20.patch	2018-12-27 21:47:55 UTC (rev 342766)
@@ -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: