Module Name: src
Committed By: martin
Date: Sun Jan 5 11:05:53 UTC 2020
Modified Files:
src/sys/external/bsd/drm2/dist/drm [netbsd-9]: drm_panel.c
src/sys/external/bsd/drm2/drm [netbsd-9]: files.drmkms
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/sys/external/bsd/drm2/dist/drm/drm_panel.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_panel.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_panel.c:1.2.4.1 src/sys/external/bsd/drm2/dist/drm/drm_panel.c:1.2.4.2
--- src/sys/external/bsd/drm2/dist/drm/drm_panel.c:1.2.4.1 Sun Jan 5 09:42:05 2020
+++ src/sys/external/bsd/drm2/dist/drm/drm_panel.c Sun Jan 5 11:05:53 2020
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_panel.c,
#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)
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.30 src/sys/external/bsd/drm2/drm/files.drmkms:1.30.4.1
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.30 Tue Aug 28 03:41:39 2018
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Jan 5 11:05:53 2020
@@ -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/drm/drm_memory.c
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
