[src/trunk]: src/sys/external/bsd/drm2/drm Include drm_internal.h by "../dist...

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

details:   https://anonhg.NetBSD.org/src/rev/b95e7be42173
branches:  trunk
changeset: 1027775:b95e7be42173
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 00:28:20 2021 +0000

description:
Include drm_internal.h by "../dist/drm/drm_internal.h".

diffstat:

 sys/external/bsd/drm2/drm/drm_agp_hook.c |  7 ++++---
 sys/external/bsd/drm2/drm/drm_cdevsw.c   |  7 ++++---
 sys/external/bsd/drm2/drm/drm_lock.c     |  7 ++++---
 sys/external/bsd/drm2/drm/drm_module.c   |  7 ++++---
 sys/external/bsd/drm2/drm/drm_scatter.c  |  7 ++++---
 sys/external/bsd/drm2/drm/drm_sysfs.c    |  7 ++++---
 6 files changed, 24 insertions(+), 18 deletions(-)

diffs (165 lines):

diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_agp_hook.c
--- a/sys/external/bsd/drm2/drm/drm_agp_hook.c  Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_agp_hook.c  Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $     */
+/*     $NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.3 2018/08/30 22:39:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_agp_hook.c,v 1.4 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/condvar.h>
@@ -39,7 +39,8 @@
 #include <sys/once.h>
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
 
 static struct {
        kmutex_t                        lock;
diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_cdevsw.c
--- a/sys/external/bsd/drm2/drm/drm_cdevsw.c    Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_cdevsw.c    Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_cdevsw.c,v 1.16 2021/09/26 01:16:10 thorpej Exp $  */
+/*     $NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 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.16 2021/09/26 01:16:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.17 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -58,7 +58,8 @@
 #include <linux/pm.h>
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
 #include "../dist/drm/drm_legacy.h"
 
 static dev_type_open(drm_open);
diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_lock.c
--- a/sys/external/bsd/drm2/drm/drm_lock.c      Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_lock.c      Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $  */
+/*     $NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -46,14 +46,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.8 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_lock.c,v 1.9 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
 #include "../dist/drm/drm_legacy.h"
 
 static bool    drm_lock_acquire(struct drm_lock_data *, int);
diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_module.c,v 1.17 2020/01/03 21:01:16 jmcneill Exp $ */
+/*     $NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 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.17 2020/01/03 21:01:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.18 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/condvar.h>
@@ -46,10 +46,11 @@
 
 #include <drm/drmP.h>
 #include <drm/drm_encoder_slave.h>
-#include <drm/drm_internal.h>
 #include <drm/drm_sysctl.h>
 #include <drm/drm_panel.h>
 
+#include "../dist/drm/drm_internal.h"
+
 /*
  * XXX This is stupid.
  *
diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_scatter.c
--- a/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $        */
+/*     $NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.5 2018/08/27 07:02:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.6 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
@@ -40,7 +40,8 @@
 #include <linux/slab.h>
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
 #include "../dist/drm/drm_legacy.h"
 
 static int     drm_sg_alloc_mem(struct drm_device *, size_t,
diff -r 5e408a3f92ea -r b95e7be42173 sys/external/bsd/drm2/drm/drm_sysfs.c
--- a/sys/external/bsd/drm2/drm/drm_sysfs.c     Sun Dec 19 00:28:12 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_sysfs.c     Sun Dec 19 00:28:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_sysfs.c,v 1.4 2018/08/27 07:00:09 riastradh Exp $  */
+/*     $NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.4 2018/08/27 07:00:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_sysfs.c,v 1.5 2021/12/19 00:28:20 riastradh Exp $");
 
 #include <drm/drmP.h>
-#include <drm/drm_internal.h>
+
+#include "../dist/drm/drm_internal.h"
 
 int
 drm_sysfs_connector_add(struct drm_connector *connector __unused)