Module Name: src
Committed By: riastradh
Date: Tue Aug 28 03:34:40 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_module.c
src/sys/external/bsd/drm2/i915drm: i915_module.c
src/sys/external/bsd/drm2/pci: drm_pci.c
src/sys/external/bsd/drm2/radeon: radeon_module.c
src/sys/external/bsd/drm2/via: via_module.c
Log Message:
Eliminate drm_pci_init/exit. Empty for a while, no need.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/i915drm/i915_module.c
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/drm2/pci/drm_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/radeon/radeon_module.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/via/via_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/amdgpu/amdgpu_module.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.2 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.3
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.2 Mon Aug 27 14:13:29 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c Tue Aug 28 03:34:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_module.c,v 1.2 2018/08/27 14:13:29 riastradh Exp $ */
+/* $NetBSD: amdgpu_module.c,v 1.3 2018/08/28 03:34:39 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_module.c,v 1.2 2018/08/27 14:13:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_module.c,v 1.3 2018/08/28 03:34:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -75,13 +75,6 @@ amdgpu_init(void)
#endif
amdgpu_amdkfd_init();
-
- error = drm_pci_init(amdgpu_drm_driver, NULL);
- if (error) {
- aprint_error("amdgpu: failed to init pci: %d\n",
- error);
- return error;
- }
drm_sysctl_init(&amdgpu_def);
return 0;
@@ -105,7 +98,6 @@ amdgpu_fini(void)
{
drm_sysctl_fini(&amdgpu_def);
- drm_pci_exit(amdgpu_drm_driver, NULL);
amdgpu_amdkfd_fini();
#if notyet /* XXX amdgpu acpi */
amdgpu_unregister_atpx_handler();
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.6 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.7
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.6 Mon Aug 27 07:27:51 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Tue Aug 28 03:34:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_module.c,v 1.6 2018/08/27 07:27:51 riastradh Exp $ */
+/* $NetBSD: i915_module.c,v 1.7 2018/08/28 03:34:39 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.6 2018/08/27 07:27:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.7 2018/08/28 03:34:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -71,12 +71,6 @@ i915drmkms_init(void)
i915_drm_driver->driver_features |= DRIVER_MODESET;
i915_drm_driver->driver_features &= ~DRIVER_USE_AGP;
- error = drm_pci_init(i915_drm_driver, NULL);
- if (error) {
- aprint_error("i915drmkms: failed to init pci: %d\n",
- error);
- return error;
- }
drm_sysctl_init(&i915_def);
spin_lock_init(&mchdev_lock);
@@ -102,7 +96,6 @@ i915drmkms_fini(void)
spin_lock_destroy(&mchdev_lock);
drm_sysctl_fini(&i915_def);
- drm_pci_exit(i915_drm_driver, NULL);
}
static int
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.29 src/sys/external/bsd/drm2/pci/drm_pci.c:1.30
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.29 Mon Aug 27 15:32:06 2018
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Tue Aug 28 03:34:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.29 2018/08/27 15:32:06 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.30 2018/08/28 03:34:39 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.29 2018/08/27 15:32:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.30 2018/08/28 03:34:39 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -54,20 +54,6 @@ drm_pci_attach_args(struct drm_device *d
}
int
-drm_pci_init(struct drm_driver *driver __unused,
- struct pci_driver *pdriver __unused)
-{
-
- return 0;
-}
-
-void
-drm_pci_exit(struct drm_driver *driver __unused,
- struct pci_driver *pdriver __unused)
-{
-}
-
-int
drm_pci_attach(device_t self, const struct pci_attach_args *pa,
struct pci_dev *pdev, struct drm_driver *driver, unsigned long cookie,
struct drm_device **devp)
Index: src/sys/external/bsd/drm2/radeon/radeon_module.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_module.c:1.3 src/sys/external/bsd/drm2/radeon/radeon_module.c:1.4
--- src/sys/external/bsd/drm2/radeon/radeon_module.c:1.3 Wed Nov 12 03:14:00 2014
+++ src/sys/external/bsd/drm2/radeon/radeon_module.c Tue Aug 28 03:34:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_module.c,v 1.3 2014/11/12 03:14:00 christos Exp $ */
+/* $NetBSD: radeon_module.c,v 1.4 2018/08/28 03:34:40 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_module.c,v 1.3 2014/11/12 03:14:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_module.c,v 1.4 2018/08/28 03:34:40 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -69,12 +69,6 @@ radeon_init(void)
radeon_drm_driver->num_ioctls = radeon_max_kms_ioctl;
radeon_drm_driver->driver_features |= DRIVER_MODESET;
- error = drm_pci_init(radeon_drm_driver, NULL);
- if (error) {
- aprint_error("radeon: failed to init pci: %d\n",
- error);
- return error;
- }
drm_sysctl_init(&radeon_def);
return 0;
@@ -96,8 +90,8 @@ radeon_guarantee_initialized(void)
static void
radeon_fini(void)
{
+
drm_sysctl_fini(&radeon_def);
- drm_pci_exit(radeon_drm_driver, NULL);
}
static int
Index: src/sys/external/bsd/drm2/via/via_module.c
diff -u src/sys/external/bsd/drm2/via/via_module.c:1.2 src/sys/external/bsd/drm2/via/via_module.c:1.3
--- src/sys/external/bsd/drm2/via/via_module.c:1.2 Sat Sep 5 23:04:01 2015
+++ src/sys/external/bsd/drm2/via/via_module.c Tue Aug 28 03:34:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: via_module.c,v 1.2 2015/09/05 23:04:01 dholland Exp $ */
+/* $NetBSD: via_module.c,v 1.3 2018/08/28 03:34:40 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_module.c,v 1.2 2015/09/05 23:04:01 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_module.c,v 1.3 2018/08/28 03:34:40 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -61,13 +61,6 @@ viadrm_init(void)
if (error)
return error;
- error = drm_pci_init(via_drm_driver, NULL);
- if (error) {
- aprint_error("viadrmkms: failed to init pci: %d\n",
- error);
- return error;
- }
-
return 0;
}
@@ -87,8 +80,6 @@ viadrm_guarantee_initialized(void)
static void
viadrm_fini(void)
{
-
- drm_pci_exit(via_drm_driver, NULL);
}
static int
