[src/trunk]: src/sys/external/bsd/drm2/dist/drm undo accidental diff against ...

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

details:   https://anonhg.NetBSD.org/src/rev/3fd97276b19b
branches:  trunk
changeset: 1028174:3fd97276b19b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:45:18 2021 +0000

description:
undo accidental diff against upstream


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/drm_drv.c |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r f05ef41a0087 -r 3fd97276b19b sys/external/bsd/drm2/dist/drm/drm_drv.c
--- a/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 09:45:10 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/drm_drv.c  Sun Dec 19 09:45:18 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_drv.c,v 1.17 2021/12/19 00:58:30 riastradh Exp $   */
+/*     $NetBSD: drm_drv.c,v 1.18 2021/12/19 09:45:18 riastradh Exp $   */
 
 /*
  * Created: Fri Jan 19 10:48:35 2001 by faith%acm.org@localhost
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.17 2021/12/19 00:58:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.18 2021/12/19 09:45:18 riastradh Exp $");
 
 #include <linux/debugfs.h>
 #include <linux/fs.h>
@@ -63,6 +63,15 @@
 static struct idr drm_minors_idr;
 #endif
 
+/*
+ * If the drm core fails to init for whatever reason,
+ * we should prevent any drivers from registering with it.
+ * It's best to check this at drm_dev_init(), as some drivers
+ * prefer to embed struct drm_device into their own device
+ * structure and call drm_dev_init() themselves.
+ */
+static bool drm_core_init_complete = false;
+
 #ifndef __NetBSD__
 static struct dentry *drm_debugfs_root;
 #endif