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

[Jan Steffens]

    Date: Friday, October 26, 2018 @ 19:24:05
  Author: heftig
Revision: 337337

390.87-9

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

-------------------+
 PKGBUILD          |   14 +++++++----
 kernel-4.19.patch |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-26 19:17:11 UTC (rev 337336)
+++ PKGBUILD	2018-10-26 19:24:05 UTC (rev 337337)
@@ -6,19 +6,20 @@
 pkgname=(nvidia-390xx nvidia-390xx-dkms)
 pkgver=390.87
 _extramodules=extramodules-ARCH
-pkgrel=8
+pkgrel=9
 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.18' 'linux-headers<4.19')
+makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.19' 'linux-headers<4.20')
 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.16.patch kernel-4.19.patch)
 sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
-            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
+            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
+            '97b392ce8a193ee64d3a3d0655936a02c5d7623730b69e5119664d01c3df8392')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
@@ -28,6 +29,9 @@
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
 
+    # Ad-hoc patch
+    patch -Np1 -i ../kernel-4.19.patch
+
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
@@ -54,7 +58,7 @@
 
 package_nvidia-390xx() {
     pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
-    depends=('linux>=4.18' 'linux<4.19' "nvidia-390xx-utils=${pkgver}" 'libglvnd')
+    depends=('linux>=4.19' 'linux<4.20' "nvidia-390xx-utils=${pkgver}" 'libglvnd')
 
     install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
       "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko

Added: kernel-4.19.patch
===================================================================
--- kernel-4.19.patch	                        (rev 0)
+++ kernel-4.19.patch	2018-10-26 19:24:05 UTC (rev 337337)
@@ -0,0 +1,61 @@
+diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
+--- a/kernel/conftest.sh	2018-10-26 21:12:23.587468332 +0200
++++ b/kernel/conftest.sh	2018-10-26 21:15:22.541274337 +0200
+@@ -2363,17 +2363,17 @@
+ 
+         ;;
+ 
+-        drm_mode_connector_list_update_has_merge_type_bits_arg)
++        drm_connector_list_update_has_merge_type_bits_arg)
+             #
+-            # Detect if drm_mode_connector_list_update() has a
++            # Detect if drm_connector_list_update() has a
+             # 'merge_type_bits' second argument.  This argument was
+             # remove by:
+             #   2015-12-03  6af3e6561243f167dabc03f732d27ff5365cd4a4
+             #
+             CODE="
+             #include <drm/drmP.h>
+-            void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
+-                drm_mode_connector_list_update(
++            void conftest_drm_connector_list_update_has_merge_type_bits_arg(void) {
++                drm_connector_list_update(
+                     NULL,  /* struct drm_connector *connector */
+                     true); /* bool merge_type_bits */
+             }"
+diff -u -r 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-08-22 02:55:29.000000000 +0200
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c	2018-10-26 21:14:14.891095557 +0200
+@@ -226,7 +226,7 @@
+ 
+ 
+     if (nv_connector->edid != NULL) {
+-        drm_mode_connector_update_edid_property(
++        drm_connector_update_edid_property(
+             connector, nv_connector->edid);
+     }
+ 
+diff -u -r a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 02:55:29.000000000 +0200
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-10-26 21:13:46.644354274 +0200
+@@ -216,7 +216,7 @@
+ 
+     /* Attach encoder and connector */
+ 
+-    ret = drm_mode_connector_attach_encoder(connector, encoder);
++    ret = drm_connector_attach_encoder(connector, encoder);
+ 
+     if (ret != 0) {
+         NV_DRM_DEV_LOG_ERR(
+diff -u -r a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild
+--- a/kernel/nvidia-drm/nvidia-drm.Kbuild	2018-08-21 23:45:43.000000000 +0200
++++ b/kernel/nvidia-drm/nvidia-drm.Kbuild	2018-10-26 21:15:39.911320257 +0200
+@@ -74,7 +74,7 @@
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args
+-NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg
++NV_CONFTEST_TYPE_COMPILE_TESTS += drm_connector_list_update_has_merge_type_bits_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_master_drop_has_from_release_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_unload_has_int_return_type