Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:45:18 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_drv.c
Log Message:
undo accidental diff against upstream
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
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_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.17 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.17 Sun Dec 19 00:58:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Sun Dec 19 09:45:18 2021
@@ -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 fa...@acm.org
@@ -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 DEFINE_SPINLOCK(drm_minor_lock);
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
