CVS commit: src/sys/external/bsd/drm2

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:01:29 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm: drm_drv.c
        src/sys/external/bsd/drm2/drm: drm_module.c

Log Message:
Initialize drm_core_init_complete in drm_module.c

Linux achieves this with a module_init(drm_core_init);

Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/dist/drm/drm_drv.c
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/drm/drm_module.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.19 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.19	Sun Dec 19 09:45:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c	Sun Dec 19 11:01:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_drv.c,v 1.19 2021/12/19 09:45:25 riastradh Exp $	*/
+/*	$NetBSD: drm_drv.c,v 1.20 2021/12/19 11:01:29 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.19 2021/12/19 09:45:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.20 2021/12/19 11:01:29 riastradh Exp $");
 
 #include <linux/debugfs.h>
 #include <linux/fs.h>
@@ -72,7 +72,7 @@ static struct idr drm_minors_idr;
  * prefer to embed struct drm_device into their own device
  * structure and call drm_dev_init() themselves.
  */
-static bool drm_core_init_complete = false;
+bool drm_core_init_complete = false;
 
 #ifndef __NetBSD__
 static struct dentry *drm_debugfs_root;

Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.25 src/sys/external/bsd/drm2/drm/drm_module.c:1.26
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.25	Sun Dec 19 10:36:21 2021
+++ src/sys/external/bsd/drm2/drm/drm_module.c	Sun Dec 19 11:01:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: drm_module.c,v 1.25 2021/12/19 10:36:21 riastradh Exp $	*/
+/*	$NetBSD: drm_module.c,v 1.26 2021/12/19 11:01:29 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.25 2021/12/19 10:36:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.26 2021/12/19 11:01:29 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/condvar.h>
@@ -110,6 +110,9 @@ drm_init(void)
 	if (error)
 		return error;
 
+	extern bool drm_core_init_complete;
+	drm_core_init_complete = true;
+
 	drm_agp_hooks_init();
 #if NAGP > 0
 	extern int drmkms_agp_guarantee_initialized(void);