From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 2 Jan 2019 01:05:09 +0000 (+0900)
Subject: - rel 4
X-Git-Tag: auto/th/xorg-driver-video-nvidia-legacy-390xx-390.87-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia-legacy-390xx.git;a=commitdiff_plain;h=fdd1f506f025703e3e9727d60f4eec393d63e4f9

- rel 4
- fix building with kernel 4.20
---

diff --git a/kernel-4.20.patch b/kernel-4.20.patch
new file mode 100644
index 0000000..7b5022c
--- /dev/null
+++ b/kernel-4.20.patch
@@ -0,0 +1,46 @@
+--- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c~	2018-08-22 09:55:22.000000000 +0900
++++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia/os-interface.c	2019-01-02 09:55:45.271845101 +0900
+@@ -1697,7 +1697,11 @@
+ 
+ struct nv_ipmi_softc
+ {
++#if defined(ipmi_user_t)
+     ipmi_user_t         p_user;     // ptr to ipmi_msghandler user structure
++#else
++    struct ipmi_user    *p_user;     // ptr to ipmi_msghandler user structure
++#endif
+     spinlock_t          msg_lock;
+     struct list_head    msgs;
+     NvU32               seqNum;     //request sequence number
+@@ -1706,7 +1710,11 @@
+ static inline int
+ nv_ipmi_set_my_address
+ (
++#if defined(ipmi_user_t)
+     ipmi_user_t     user,
++#else
++    struct ipmi_user    *user,
++#endif
+     unsigned char   address
+ )
+ {
+--- NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c~	2018-08-22 09:55:29.000000000 +0900
++++ NVIDIA-Linux-x86_64-390.87-no-compat32/kernel/nvidia-drm/nvidia-drm-gem-nvkms-memory.c	2019-01-02 10:00:43.465451775 +0900
+@@ -237,6 +237,9 @@
+ 
+     page_offset = vmf->pgoff - drm_vma_node_start(&gem->vma_node);
+ 
++#if !defined(vm_insert_pfn)
++    return vmf_insert_pfn(vma, address, pfn + page_offset);
++#else
+     ret = vm_insert_pfn(vma, address, pfn + page_offset);
+ 
+     switch (ret) {
+@@ -258,6 +258,7 @@
+     }
+ 
+     return VM_FAULT_SIGBUS;
++#endif
+ }
+ 
+ /*
diff --git a/xorg-driver-video-nvidia-legacy-390xx.spec b/xorg-driver-video-nvidia-legacy-390xx.spec
index e963f5e..7258336 100644
--- a/xorg-driver-video-nvidia-legacy-390xx.spec
+++ b/xorg-driver-video-nvidia-legacy-390xx.spec
@@ -33,7 +33,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	3
+%define		rel	4
 %define		pname	xorg-driver-video-nvidia-legacy-390xx
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -57,6 +57,7 @@ Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
 Patch2:		kernel-4.19.patch
 Patch3:		kernel-4.4.169.patch
+Patch4:		kernel-4.20.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -272,6 +273,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build