Module Name: src
Committed By: riastradh
Date: Fri Apr 4 15:16:59 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm: drm_drv.c drm_module.c
Log Message:
Figure drm_debug into the drm_init module kludgerosity.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.4 -r1.5 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/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.2 src/sys/external/bsd/drm2/drm/drm_drv.c:1.3
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.2 Tue Mar 18 18:20:42 2014
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Fri Apr 4 15:16:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: drm_drv.c,v 1.3 2014/04/04 15:16:59 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.2 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.3 2014/04/04 15:16:59 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -45,6 +45,9 @@ __KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v
#include <sys/once.h>
#endif
#include <sys/poll.h>
+#ifndef _MODULE
+#include <sys/reboot.h> /* XXX drm_init kludge */
+#endif
#include <sys/select.h>
#include <uvm/uvm_extern.h>
@@ -455,6 +458,9 @@ drm_init(void)
linux_suppress_init = 1;
linux_mutex_init(&drm_global_mutex);
+ if (ISSET(boothowto, AB_DEBUG))
+ drm_debug = ~(unsigned int)0;
+
return 0;
fail1: linux_kmap_fini();
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.4 src/sys/external/bsd/drm2/drm/drm_module.c:1.5
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.4 Thu Apr 3 15:16:18 2014
+++ src/sys/external/bsd/drm2/drm/drm_module.c Fri Apr 4 15:16:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.4 2014/04/03 15:16:18 riastradh Exp $ */
+/* $NetBSD: drm_module.c,v 1.5 2014/04/04 15:16:59 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.4 2014/04/03 15:16:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.5 2014/04/04 15:16:59 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -49,10 +49,12 @@ MODULE(MODULE_CLASS_DRIVER, drmkms, "iic
#include "ioconf.c"
#endif
-#ifndef _MODULE
/*
* XXX Mega-kludge. See drm_init in drm_drv.c for details.
*/
+#ifdef _MODULE
+static const int linux_suppress_init = 1;
+#else
extern int linux_suppress_init;
#endif
@@ -66,10 +68,11 @@ drmkms_modcmd(modcmd_t cmd, void *arg __
switch (cmd) {
case MODULE_CMD_INIT:
-#ifndef _MODULE
- if (!linux_suppress_init)
-#endif
- linux_mutex_init(&drm_global_mutex);
+ if (!linux_suppress_init) {
+ linux_mutex_init(&drm_global_mutex);
+ if (ISSET(boothowto, AB_DEBUG))
+ drm_debug = ~(unsigned int)0;
+ }
#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_drmkms,
cfattach_ioconf_drmkms, cfdata_ioconf_drmkms);
@@ -86,8 +89,6 @@ drmkms_modcmd(modcmd_t cmd, void *arg __
goto init_fail1;
}
#endif
- if (ISSET(boothowto, AB_DEBUG))
- drm_debug = ~(unsigned int)0;
return 0;
#ifdef _MODULE
