[src/trunk]: src/sys/external/bsd/drm2 Remove last users of drmP.h.

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

details:   https://anonhg.NetBSD.org/src/rev/004d942f42c6
branches:  trunk
changeset: 1028303:004d942f42c6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:32:59 2021 +0000

description:
Remove last users of drmP.h.

diffstat:

 sys/external/bsd/drm2/amdgpu/amdgpu_module.c      |  6 +++---
 sys/external/bsd/drm2/amdgpu/amdgpu_pci.c         |  8 ++++----
 sys/external/bsd/drm2/amdgpu/amdgpufb.c           |  5 ++---
 sys/external/bsd/drm2/drm/drm_cdevsw.c            |  6 +++---
 sys/external/bsd/drm2/drm/drm_memory.c            |  6 +++---
 sys/external/bsd/drm2/drm/drm_module.c            |  9 ++++-----
 sys/external/bsd/drm2/drm/drm_scatter.c           |  6 +++---
 sys/external/bsd/drm2/drm/drmfb.c                 |  6 +++---
 sys/external/bsd/drm2/i915drm/i915_module.c       |  6 +++---
 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c |  8 ++++----
 sys/external/bsd/drm2/i915drm/intelfb.c           |  6 +++---
 sys/external/bsd/drm2/i915drm/intelfb.h           |  5 +++--
 sys/external/bsd/drm2/include/amdgpufb.h          |  5 +++--
 sys/external/bsd/drm2/nouveau/nouveau_module.c    |  5 ++---
 sys/external/bsd/drm2/nouveau/nouveau_pci.c       |  8 ++++----
 sys/external/bsd/drm2/nouveau/nouveaufb.c         |  5 ++---
 sys/external/bsd/drm2/nouveau/nouveaufb.h         |  5 +++--
 sys/external/bsd/drm2/pci/drm_pci.c               |  8 ++++----
 sys/external/bsd/drm2/pci/drmfb_pci.c             |  6 +++---
 sys/external/bsd/drm2/radeon/radeon_module.c      |  6 +++---
 sys/external/bsd/drm2/radeon/radeon_pci.c         |  7 ++++---
 sys/external/bsd/drm2/radeon/radeondrmkmsfb.c     |  5 ++---
 sys/external/bsd/drm2/radeon/radeondrmkmsfb.h     |  5 +++--
 sys/external/bsd/drm2/via/via_module.c            |  6 +++---
 sys/external/bsd/drm2/via/via_pci.c               |  7 ++++---
 25 files changed, 78 insertions(+), 77 deletions(-)

diffs (truncated from 678 to 300 lines):

diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/amdgpu/amdgpu_module.c
--- a/sys/external/bsd/drm2/amdgpu/amdgpu_module.c      Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/amdgpu/amdgpu_module.c      Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_module.c,v 1.4 2018/08/28 03:35:08 riastradh Exp $      */
+/*     $NetBSD: amdgpu_module.c,v 1.5 2021/12/19 10:32:59 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.4 2018/08/28 03:35:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_module.c,v 1.5 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -39,7 +39,7 @@
 #endif
 #include <sys/systm.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
 #include <drm/drm_sysctl.h>
 
 #include "amdgpu_amdkfd.h"
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
--- a/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpu_pci.c,v 1.5 2018/08/27 14:41:26 riastradh Exp $ */
+/*     $NetBSD: amdgpu_pci.c,v 1.6 2021/12/19 10:32:59 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,19 +30,19 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.5 2018/08/27 14:41:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_pci.c,v 1.6 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/workqueue.h>
 
-#include <drm/drmP.h>
-
 #include <amdgpu.h>
 #include "amdgpu_drv.h"
 #include "amdgpu_task.h"
 
+struct drm_device;
+
 SIMPLEQ_HEAD(amdgpu_task_head, amdgpu_task);
 
 struct amdgpu_softc {
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/amdgpu/amdgpufb.c
--- a/sys/external/bsd/drm2/amdgpu/amdgpufb.c   Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/amdgpu/amdgpufb.c   Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: amdgpufb.c,v 1.1 2018/08/27 14:02:32 riastradh Exp $   */
+/*     $NetBSD: amdgpufb.c,v 1.2 2021/12/19 10:32:59 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,14 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpufb.c,v 1.1 2018/08/27 14:02:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpufb.c,v 1.2 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 
-#include <drm/drmP.h>
 #include <drm/drmfb.h>
 #include <drm/drmfb_pci.h>
 
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/drm/drm_cdevsw.c
--- a/sys/external/bsd/drm2/drm/drm_cdevsw.c    Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_cdevsw.c    Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_cdevsw.c,v 1.23 2021/12/19 09:52:00 riastradh Exp $        */
+/*     $NetBSD: drm_cdevsw.c,v 1.24 2021/12/19 10:32:59 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.23 2021/12/19 09:52:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -57,7 +57,7 @@
 
 #include <linux/pm.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_file.h>
 #include <drm/drm_irq.h>
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/drm/drm_memory.c
--- a/sys/external/bsd/drm2/drm/drm_memory.c    Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_memory.c    Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_memory.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $        */
+/*     $NetBSD: drm_memory.c,v 1.15 2021/12/19 10:32:59 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.14 2021/12/19 09:52:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.15 2021/12/19 10:32:59 riastradh Exp $");
 
 #if defined(__i386__) || defined(__x86_64__)
 
@@ -71,10 +71,10 @@
 #include <dev/wsfb/genfbvar.h>
 #endif
 
+#include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_legacy.h>
 #include <drm/drm_pci.h>
-#include <drm/drmP.h>
 
 /*
  * XXX drm_bus_borrow is a horrible kludge!
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/drm/drm_module.c
--- a/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_module.c    Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_module.c,v 1.23 2021/12/19 09:52:00 riastradh Exp $        */
+/*     $NetBSD: drm_module.c,v 1.24 2021/12/19 10:32:59 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.23 2021/12/19 09:52:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_module.c,v 1.24 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/condvar.h>
@@ -44,14 +44,13 @@
 
 #include <linux/mutex.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_agpsupport.h>
 #include <drm/drm_bridge.h>
+#include <drm/drm_device.h>
 #include <drm/drm_encoder_slave.h>
-#include <drm/drm_global.h>
-#include <drm/drm_sysctl.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_print.h>
+#include <drm/drm_sysctl.h>
 
 #include "../dist/drm/drm_crtc_internal.h"
 #include "../dist/drm/drm_internal.h"
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/drm/drm_scatter.c
--- a/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drm_scatter.c   Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_scatter.c,v 1.7 2021/12/19 09:50:42 riastradh Exp $        */
+/*     $NetBSD: drm_scatter.c,v 1.8 2021/12/19 10:32:59 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.7 2021/12/19 09:50:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_scatter.c,v 1.8 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/bus.h>
@@ -39,7 +39,7 @@
 
 #include <linux/slab.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
 #include <drm/drm_drv.h>
 
 #include "../dist/drm/drm_internal.h"
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/drm/drmfb.c
--- a/sys/external/bsd/drm2/drm/drmfb.c Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/drm/drmfb.c Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmfb.c,v 1.9 2021/12/19 09:53:06 riastradh Exp $      */
+/*     $NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.9 2021/12/19 09:53:06 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "vga.h"
@@ -65,7 +65,7 @@
 
 #include <dev/wsfb/genfbvar.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drmfb.h>
 
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/i915drm/i915_module.c
--- a/sys/external/bsd/drm2/i915drm/i915_module.c       Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_module.c       Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_module.c,v 1.9 2021/12/19 01:41:35 riastradh Exp $        */
+/*     $NetBSD: i915_module.c,v 1.10 2021/12/19 10:32:59 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.9 2021/12/19 01:41:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_module.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -39,7 +39,7 @@
 #endif
 #include <sys/systm.h>
 
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
 #include <drm/drm_sysctl.h>
 
 #include "i915_drv.h"
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
--- a/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_pci_autoconf.c,v 1.2 2021/12/19 01:46:16 riastradh Exp $  */
+/*     $NetBSD: i915_pci_autoconf.c,v 1.3 2021/12/19 10:32:59 riastradh Exp $  */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.2 2021/12/19 01:46:16 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci_autoconf.c,v 1.3 2021/12/19 10:32:59 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/queue.h>
@@ -38,11 +38,11 @@
 #include <sys/queue.h>
 #include <sys/workqueue.h>
 
-#include <drm/drmP.h>
-
 #include "i915_drv.h"
 #include "i915_pci.h"
 
+struct drm_device;
+
 SIMPLEQ_HEAD(i915drmkms_task_head, i915drmkms_task);
 
 struct i915drmkms_softc {
diff -r 5e0fa2deb1c6 -r 004d942f42c6 sys/external/bsd/drm2/i915drm/intelfb.c
--- a/sys/external/bsd/drm2/i915drm/intelfb.c   Sun Dec 19 10:32:47 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/intelfb.c   Sun Dec 19 10:32:59 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intelfb.c,v 1.18 2021/06/12 12:15:43 riastradh Exp $   */
+/*     $NetBSD: intelfb.c,v 1.19 2021/12/19 10:32:59 riastradh Exp $   */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */