Module Name: src
Committed By: riastradh
Date: Tue Aug 28 03:35:08 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_module.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/drm: drm_cdevsw.c drm_module.c
src/sys/external/bsd/drm2/i915drm: i915_module.c
src/sys/external/bsd/drm2/radeon: radeon_module.c
src/sys/external/bsd/drm2/via: via_module.c
Log Message:
Move decl of drm_guarantee_initialized to drmP.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c
cvs rdiff -u -r1.32 -r1.33 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/drm/drm_cdevsw.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/i915drm/i915_module.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/radeon/radeon_module.c
cvs rdiff -u -r1.3 -r1.4 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.3 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.4
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.3 Tue Aug 28 03:34:39 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_module.c,v 1.3 2018/08/28 03:34:39 riastradh Exp $ */
+/* $NetBSD: amdgpu_module.c,v 1.4 2018/08/28 03:35:08 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.3 2018/08/28 03:34:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_module.c,v 1.4 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -60,7 +60,6 @@ struct drm_sysctl_def amdgpu_def = DRM_S
static int
amdgpu_init(void)
{
- extern int drm_guarantee_initialized(void);
int error;
error = drm_guarantee_initialized();
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.32 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.33
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.32 Mon Aug 27 15:32:39 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drmP.h,v 1.32 2018/08/27 15:32:39 riastradh Exp $ */
+/* $NetBSD: drmP.h,v 1.33 2018/08/28 03:35:08 riastradh Exp $ */
/*
* Internal Header for the Direct Rendering Manager
@@ -1226,6 +1226,7 @@ void drm_minor_release(struct drm_minor
#ifdef __NetBSD__
int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t);
+int drm_guarantee_initialized(void);
#endif
/*@}*/
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.10 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.11
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.10 Mon Aug 27 14:11:04 2018
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cdevsw.c,v 1.10 2018/08/27 14:11:04 riastradh Exp $ */
+/* $NetBSD: drm_cdevsw.c,v 1.11 2018/08/28 03:35:08 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.10 2018/08/27 14:11:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.11 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -117,7 +117,6 @@ drm_open(dev_t d, int flags, int fmt, st
int fd;
struct file *fp;
int error;
- extern int drm_guarantee_initialized(void);
error = drm_guarantee_initialized();
if (error)
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.13 src/sys/external/bsd/drm2/drm/drm_module.c:1.14
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.13 Mon Aug 27 15:32:51 2018
+++ src/sys/external/bsd/drm2/drm/drm_module.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_module.c,v 1.13 2018/08/27 15:32:51 riastradh Exp $ */
+/* $NetBSD: drm_module.c,v 1.14 2018/08/28 03:35:08 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.13 2018/08/27 15:32:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.14 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/types.h>
#include <sys/condvar.h>
@@ -93,7 +93,6 @@ drm_init(void)
return 0;
}
-int drm_guarantee_initialized(void); /* XXX */
int
drm_guarantee_initialized(void)
{
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.7 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.8
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.7 Tue Aug 28 03:34:39 2018
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_module.c,v 1.7 2018/08/28 03:34:39 riastradh Exp $ */
+/* $NetBSD: i915_module.c,v 1.8 2018/08/28 03:35:08 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.7 2018/08/28 03:34:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.8 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -60,7 +60,6 @@ struct drm_sysctl_def i915_def = DRM_SYS
static int
i915drmkms_init(void)
{
- extern int drm_guarantee_initialized(void);
int error;
error = drm_guarantee_initialized();
Index: src/sys/external/bsd/drm2/radeon/radeon_module.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_module.c:1.4 src/sys/external/bsd/drm2/radeon/radeon_module.c:1.5
--- src/sys/external/bsd/drm2/radeon/radeon_module.c:1.4 Tue Aug 28 03:34:40 2018
+++ src/sys/external/bsd/drm2/radeon/radeon_module.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_module.c,v 1.4 2018/08/28 03:34:40 riastradh Exp $ */
+/* $NetBSD: radeon_module.c,v 1.5 2018/08/28 03:35:08 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.4 2018/08/28 03:34:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_module.c,v 1.5 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -59,7 +59,6 @@ struct drm_sysctl_def radeon_def = DRM_S
static int
radeon_init(void)
{
- extern int drm_guarantee_initialized(void);
int error;
error = drm_guarantee_initialized();
Index: src/sys/external/bsd/drm2/via/via_module.c
diff -u src/sys/external/bsd/drm2/via/via_module.c:1.3 src/sys/external/bsd/drm2/via/via_module.c:1.4
--- src/sys/external/bsd/drm2/via/via_module.c:1.3 Tue Aug 28 03:34:40 2018
+++ src/sys/external/bsd/drm2/via/via_module.c Tue Aug 28 03:35:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: via_module.c,v 1.3 2018/08/28 03:34:40 riastradh Exp $ */
+/* $NetBSD: via_module.c,v 1.4 2018/08/28 03:35:08 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.3 2018/08/28 03:34:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_module.c,v 1.4 2018/08/28 03:35:08 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -52,7 +52,6 @@ extern struct drm_driver *const via_drm_
static int
viadrm_init(void)
{
- extern int drm_guarantee_initialized(void);
int error;
via_init_command_verifier(); /* idempotent, no unwind needed */
