[arch-commits] Commit in nvidia/trunk (PKGBUILD fs62142.patch)

[Sven-Hendrik Haase]

    Date: Friday, March 29, 2019 @ 15:54:51
  Author: svenstaro
Revision: 349408

upgpkg: nvidia 418.56-4

Try to fix FS#62142

Added:
  nvidia/trunk/fs62142.patch
Modified:
  nvidia/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 ++++++++---
 fs62142.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-29 14:11:52 UTC (rev 349407)
+++ PKGBUILD	2019-03-29 15:54:51 UTC (rev 349408)
@@ -6,7 +6,7 @@
 pkgname=(nvidia nvidia-dkms)
 pkgver=418.56
 _extramodules=extramodules-ARCH
-pkgrel=3
+pkgrel=4
 pkgdesc="NVIDIA drivers for linux"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -15,9 +15,11 @@
 options=('!strip')
 _pkg="NVIDIA-Linux-x86_64-${pkgver}"
 source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
-        kernel-4.16.patch)
+        kernel-4.16.patch
+        fs62142.patch)
 sha512sums=('859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910'
-            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af'
+            'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
@@ -27,6 +29,9 @@
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
 
+    # Fix https://bugs.archlinux.org/task/62142
+    patch -Np1 -i ../fs62142.patch
+
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf

Added: fs62142.patch
===================================================================
--- fs62142.patch	                        (rev 0)
+++ fs62142.patch	2019-03-29 15:54:51 UTC (rev 349408)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
++++ b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+     const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
+ 
+-    return (ops->map_resource != NULL);
++    return (ops && ops->map_resource);
+ #else
+     return NV_FALSE;
+ #endif