[arch-commits] Commit in nvidia-390xx/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Saturday, February 23, 2019 @ 17:38:50
  Author: svenstaro
Revision: 346736

upgpkg: nvidia-390xx 390.116-1

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

-------------------+
 PKGBUILD          |    6 ----
 kernel-4.19.patch |   63 ----------------------------------------------------
 kernel-4.20.patch |   43 -----------------------------------
 3 files changed, 112 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-23 17:30:00 UTC (rev 346735)
+++ PKGBUILD	2019-02-23 17:38:50 UTC (rev 346736)
@@ -30,12 +30,6 @@
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
 
-    # 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

Deleted: kernel-4.19.patch
===================================================================
--- kernel-4.19.patch	2019-02-23 17:30:00 UTC (rev 346735)
+++ kernel-4.19.patch	2019-02-23 17:38:50 UTC (rev 346736)
@@ -1,63 +0,0 @@
-diff -u -r a/kernel/conftest.sh b/kernel/conftest.sh
---- 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 @@
-             #
-             CODE="
-             #include <drm/drmP.h>
-+            #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 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) {
-+#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 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 */
- 
-+#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(

Deleted: kernel-4.20.patch
===================================================================
--- kernel-4.20.patch	2019-02-23 17:30:00 UTC (rev 346735)
+++ kernel-4.20.patch	2019-02-23 17:38:50 UTC (rev 346736)
@@ -1,43 +0,0 @@
---- 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: