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

[Jan Steffens]

    Date: Thursday, November 1, 2018 @ 11:12:30
  Author: heftig
Revision: 337674

390.87-10: keep compatible with lts

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

-------------------+
 PKGBUILD          |    4 +-
 kernel-4.19.patch |   76 ++++++++++++++++++++++++++--------------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 10:09:33 UTC (rev 337673)
+++ PKGBUILD	2018-11-01 11:12:30 UTC (rev 337674)
@@ -6,7 +6,7 @@
 pkgname=(nvidia-390xx nvidia-390xx-dkms)
 pkgver=390.87
 _extramodules=extramodules-ARCH
-pkgrel=9
+pkgrel=10
 pkgdesc="NVIDIA drivers for linux, 390xx legacy branch"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -19,7 +19,7 @@
         kernel-4.16.patch kernel-4.19.patch)
 sha256sums=('c7c07151e17f610af11f7870560d96c3a3ee9bb91ba1bb82fcc7b5d473d40b66'
             '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385'
-            '97b392ce8a193ee64d3a3d0655936a02c5d7623730b69e5119664d01c3df8392')
+            'e425320bd3712cc789035d5936412724b0b410f50463980c0a48715fd3f8c431')
 
 prepare() {
     sh "${_pkg}.run" --extract-only

Modified: kernel-4.19.patch
===================================================================
--- kernel-4.19.patch	2018-11-01 10:09:33 UTC (rev 337673)
+++ kernel-4.19.patch	2018-11-01 11:12:30 UTC (rev 337674)
@@ -1,61 +1,63 @@
 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)
+--- a/kernel/conftest.sh	2018-11-01 11:00:14.429126159 +0000
++++ b/kernel/conftest.sh	2018-11-01 11:03:08.199579458 +0000
+@@ -2372,8 +2372,13 @@
              #
--            # 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) {
++            #include <linux/version.h>
+             void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) {
++            #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+                 drm_mode_connector_list_update(
++            #else
 +                drm_connector_list_update(
++            #endif
                      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 @@
+--- a/kernel/nvidia-drm/nvidia-drm-connector.c	2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-connector.c	2018-11-01 11:08:14.643715031 +0000
+@@ -34,6 +34,7 @@
  
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
  
+ static void nv_drm_connector_destroy(struct drm_connector *connector)
+ {
+@@ -226,7 +227,11 @@
+ 
+ 
      if (nv_connector->edid != NULL) {
--        drm_mode_connector_update_edid_property(
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+         drm_mode_connector_update_edid_property(
++#else
 +        drm_connector_update_edid_property(
++#endif
              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 @@
+--- a/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-08-22 00:55:29.000000000 +0000
++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c	2018-11-01 11:08:32.210427737 +0000
+@@ -34,6 +34,7 @@
  
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
++#include <linux/version.h>
+ 
+ static void nv_drm_encoder_destroy(struct drm_encoder *encoder)
+ {
+@@ -216,7 +217,11 @@
+ 
      /* Attach encoder and connector */
  
--    ret = drm_mode_connector_attach_encoder(connector, encoder);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+     ret = drm_mode_connector_attach_encoder(connector, encoder);
++#else
 +    ret = drm_connector_attach_encoder(connector, encoder);
++#endif
  
      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