Module Name: src
Committed By: riastradh
Date: Tue Aug 28 03:34:07 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau_module.c nouveau_pci.c
Log Message:
Move nouveau pci initialization to nouveau_pci where it belongs.
Somehow I forgot this was a separate module.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/nouveau/nouveau_module.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/drm2/nouveau/nouveau_pci.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/nouveau/nouveau_module.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.8 src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.9
--- src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.8 Mon Aug 27 15:31:27 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_module.c Tue Aug 28 03:34:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_module.c,v 1.8 2018/08/27 15:31:27 riastradh Exp $ */
+/* $NetBSD: nouveau_module.c,v 1.9 2018/08/28 03:34:07 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.8 2018/08/27 15:31:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.9 2018/08/28 03:34:07 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -41,10 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_modu
#include <core/device.h>
-#ifdef _KERNEL_OPT
-#include "opt_drmkms_pci.h"
-#endif
-
MODULE(MODULE_CLASS_DRIVER, nouveau, "drmkms"); /* XXX drmkms_i2c, drmkms_ttm */
#ifdef _MODULE
@@ -53,26 +49,9 @@ MODULE(MODULE_CLASS_DRIVER, nouveau, "dr
struct drm_sysctl_def nouveau_def = DRM_SYSCTL_INIT();
-#if NDRMKMS_PCI > 0
-extern struct drm_driver *const nouveau_drm_driver_stub; /* XXX */
-extern struct drm_driver *const nouveau_drm_driver_pci; /* XXX */
-#endif
-
static int
nouveau_init(void)
{
-#if NDRMKMS_PCI > 0
- int error;
-
- *nouveau_drm_driver_pci = *nouveau_drm_driver_stub;
- nouveau_drm_driver_pci->set_busid = drm_pci_set_busid;
- nouveau_drm_driver_pci->request_irq = drm_pci_request_irq;
- nouveau_drm_driver_pci->free_irq = drm_pci_free_irq;
-
- error = drm_pci_init(nouveau_drm_driver_pci, NULL);
- if (error)
- return error;
-#endif
nvkm_devices_init();
drm_sysctl_init(&nouveau_def);
@@ -86,9 +65,6 @@ nouveau_fini(void)
drm_sysctl_fini(&nouveau_def);
nvkm_devices_fini();
-#if NDRMKMS_PCI > 0
- drm_pci_exit(nouveau_drm_driver_pci, NULL);
-#endif
}
static int
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.20 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.21
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.20 Mon Aug 27 14:18:54 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Tue Aug 28 03:34:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.20 2018/08/27 14:18:54 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.21 2018/08/28 03:34:07 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.20 2018/08/27 14:18:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.21 2018/08/28 03:34:07 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -286,19 +286,19 @@ nouveau_pci_task_schedule(device_t self,
}
}
+extern struct drm_driver *const nouveau_drm_driver_stub; /* XXX */
+extern struct drm_driver *const nouveau_drm_driver_pci; /* XXX */
+
static int
nouveau_pci_modcmd(modcmd_t cmd, void *arg __unused)
{
- int error;
switch (cmd) {
case MODULE_CMD_INIT:
- error = drm_pci_init(nouveau_drm_driver_pci, NULL);
- if (error) {
- aprint_error("nouveau_pci: failed to init: %d\n",
- error);
- return error;
- }
+ *nouveau_drm_driver_pci = *nouveau_drm_driver_stub;
+ nouveau_drm_driver_pci->set_busid = drm_pci_set_busid;
+ nouveau_drm_driver_pci->request_irq = drm_pci_request_irq;
+ nouveau_drm_driver_pci->free_irq = drm_pci_free_irq;
#if 0 /* XXX nouveau acpi */
nouveau_register_dsm_handler();
#endif
@@ -307,7 +307,6 @@ nouveau_pci_modcmd(modcmd_t cmd, void *a
#if 0 /* XXX nouveau acpi */
nouveau_unregister_dsm_handler();
#endif
- drm_pci_exit(nouveau_drm_driver_pci, NULL);
break;
default:
return ENOTTY;
