[src/trunk]: src/sys/external/bsd/drm2 Move decl of drm_guarantee_initialized...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/578d9268594a
branches:  trunk
changeset: 366460:578d9268594a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Aug 28 03:35:08 2018 +0000

description:
Move decl of drm_guarantee_initialized to drmP.h.

diffstat:

 sys/external/bsd/drm2/amdgpu/amdgpu_module.c  |  5 ++---
 sys/external/bsd/drm2/dist/include/drm/drmP.h |  3 ++-
 sys/external/bsd/drm2/drm/drm_cdevsw.c        |  5 ++---
 sys/external/bsd/drm2/drm/drm_module.c        |  5 ++---
 sys/external/bsd/drm2/i915drm/i915_module.c   |  5 ++---
 sys/external/bsd/drm2/radeon/radeon_module.c  |  5 ++---
 sys/external/bsd/drm2/via/via_module.c        |  5 ++---
 7 files changed, 14 insertions(+), 19 deletions(-)

diffs (173 lines):

diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/amdgpu/amdgpu_module.c
--- a/sys/external/bsd/drm2/amdgpu/amdgpu_module.c      Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/amdgpu/amdgpu_module.c      Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
 static int
 amdgpu_init(void)
 {
-       extern int drm_guarantee_initialized(void);
        int error;
 
        error = drm_guarantee_initialized();
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
 
 #ifdef __NetBSD__
 int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t);
+int drm_guarantee_initialized(void);
 #endif
 
 /*@}*/
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/drm/drm_cdevsw.c
--- a/sys/external/bsd/drm2/drm/drm_cdevsw.c    Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_cdevsw.c    Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
        int fd;
        struct file *fp;
        int error;
-       extern int drm_guarantee_initialized(void);
 
        error = drm_guarantee_initialized();
        if (error)
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c    Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
        return 0;
 }
 
-int    drm_guarantee_initialized(void); /* XXX */
 int
 drm_guarantee_initialized(void)
 {
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/i915drm/i915_module.c
--- a/sys/external/bsd/drm2/i915drm/i915_module.c       Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_module.c       Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
 static int
 i915drmkms_init(void)
 {
-       extern int drm_guarantee_initialized(void);
        int error;
 
        error = drm_guarantee_initialized();
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/radeon/radeon_module.c
--- a/sys/external/bsd/drm2/radeon/radeon_module.c      Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/radeon/radeon_module.c      Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
 static int
 radeon_init(void)
 {
-       extern int drm_guarantee_initialized(void);
        int error;
 
        error = drm_guarantee_initialized();
diff -r 3e81b80f695a -r 578d9268594a sys/external/bsd/drm2/via/via_module.c
--- a/sys/external/bsd/drm2/via/via_module.c    Tue Aug 28 03:34:53 2018 +0000
+++ b/sys/external/bsd/drm2/via/via_module.c    Tue Aug 28 03:35:08 2018 +0000
@@ -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 @@
 static int
 viadrm_init(void)
 {
-       extern int drm_guarantee_initialized(void);
        int error;
 
        via_init_command_verifier(); /* idempotent, no unwind needed */