[src/netbsd-9]: src/sys/external/bsd/drm2 Pull up following revision(s) (requ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/83f068cf8094
branches:  netbsd-9
changeset: 466934:83f068cf8094
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 05 11:05:53 2020 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #607):

        sys/external/bsd/drm2/drm/files.drmkms: revision 1.33
        sys/external/bsd/drm2/dist/drm/drm_panel.c: revision 1.3

workaround netbsd incompatible LIST_HEAD
adapted from drm_bridge.c r1.3

build drm_panel.c w/ drmkms

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_panel.c |  9 +++++++--
 sys/external/bsd/drm2/drm/files.drmkms     |  3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 327949d5ecd4 -r 83f068cf8094 sys/external/bsd/drm2/dist/drm/drm_panel.c
--- a/sys/external/bsd/drm2/dist/drm/drm_panel.c        Sun Jan 05 09:56:59 2020 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_panel.c        Sun Jan 05 11:05:53 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_panel.c,v 1.2.4.1 2020/01/05 09:42:05 martin Exp $ */
+/*     $NetBSD: drm_panel.c,v 1.2.4.2 2020/01/05 11:05:53 martin Exp $ */
 
 /*
  * Copyright (C) 2013, NVIDIA Corporation.  All rights reserved.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_panel.c,v 1.2.4.1 2020/01/05 09:42:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_panel.c,v 1.2.4.2 2020/01/05 11:05:53 martin Exp $");
 
 #include <linux/err.h>
 #include <linux/module.h>
@@ -32,8 +32,13 @@
 #include <drm/drm_crtc.h>
 #include <drm/drm_panel.h>
 
+#ifdef __NetBSD__
+static struct mutex panel_lock;
+static struct list_head panel_list = LIST_HEAD_INIT(panel_list);
+#else
 static DEFINE_MUTEX(panel_lock);
 static LIST_HEAD(panel_list);
+#endif
 
 #ifdef __NetBSD__
 void drm_panel_init_lock(void)
diff -r 327949d5ecd4 -r 83f068cf8094 sys/external/bsd/drm2/drm/files.drmkms
--- a/sys/external/bsd/drm2/drm/files.drmkms    Sun Jan 05 09:56:59 2020 +0000
+++ b/sys/external/bsd/drm2/drm/files.drmkms    Sun Jan 05 11:05:53 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.drmkms,v 1.30 2018/08/28 03:41:39 riastradh Exp $
+#      $NetBSD: files.drmkms,v 1.30.4.1 2020/01/05 11:05:53 martin Exp $
 
 include "external/bsd/drm2/linux/files.drmkms_linux"
 
@@ -89,6 +89,7 @@
 file   external/bsd/drm2/dist/drm/drm_mm.c     drmkms
 file   external/bsd/drm2/dist/drm/drm_modes.c  drmkms
 file   external/bsd/drm2/dist/drm/drm_modeset_lock.c   drmkms
+file   external/bsd/drm2/dist/drm/drm_panel.c  drmkms
 #file  external/bsd/drm2/dist/drm/drm_pci.c    drmkms  # drmkms_pci
 file   external/bsd/drm2/dist/drm/drm_plane_helper.c   drmkms
 #file  external/bsd/drm2/dist/drm/drm_platform.c       drmkms