Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:33:00 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/amdgpu: amdgpu_module.c amdgpu_pci.c
amdgpufb.c
src/sys/external/bsd/drm2/drm: drm_cdevsw.c drm_memory.c drm_module.c
drm_scatter.c drmfb.c
src/sys/external/bsd/drm2/i915drm: i915_module.c i915_pci_autoconf.c
intelfb.c intelfb.h
src/sys/external/bsd/drm2/include: amdgpufb.h
src/sys/external/bsd/drm2/nouveau: nouveau_module.c nouveau_pci.c
nouveaufb.c nouveaufb.h
src/sys/external/bsd/drm2/pci: drm_pci.c drmfb_pci.c
src/sys/external/bsd/drm2/radeon: radeon_module.c radeon_pci.c
radeondrmkmsfb.c radeondrmkmsfb.h
src/sys/external/bsd/drm2/via: via_module.c via_pci.c
Log Message:
Remove last users of drmP.h.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/amdgpu/amdgpufb.c
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/drm2/drm/drm_cdevsw.c \
src/sys/external/bsd/drm2/drm/drm_module.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/drm/drm_scatter.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/drm/drmfb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/i915drm/i915_module.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/i915drm/intelfb.h
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/include/amdgpufb.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/nouveau/nouveau_module.c
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/nouveau/nouveaufb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/nouveau/nouveaufb.h
cvs rdiff -u -r1.40 -r1.41 src/sys/external/bsd/drm2/pci/drm_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/pci/drmfb_pci.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/radeon/radeon_module.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/radeon/radeon_pci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/via/via_module.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/via/via_pci.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.4 src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.5
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c:1.4 Tue Aug 28 03:35:08 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_module.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: amdgpu_modul
#endif
#include <sys/systm.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_sysctl.h>
#include "amdgpu_amdkfd.h"
Index: src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.5 src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.6
--- src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c:1.5 Mon Aug 27 14:41:26 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpu_pci.c Sun Dec 19 10:32:59 2021
@@ -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 {
Index: src/sys/external/bsd/drm2/amdgpu/amdgpufb.c
diff -u src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.1 src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.2
--- src/sys/external/bsd/drm2/amdgpu/amdgpufb.c:1.1 Mon Aug 27 14:02:32 2018
+++ src/sys/external/bsd/drm2/amdgpu/amdgpufb.c Sun Dec 19 10:32:59 2021
@@ -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>
Index: src/sys/external/bsd/drm2/drm/drm_cdevsw.c
diff -u src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.23 src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.24
--- src/sys/external/bsd/drm2/drm/drm_cdevsw.c:1.23 Sun Dec 19 09:52:00 2021
+++ src/sys/external/bsd/drm2/drm/drm_cdevsw.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_cdevsw.c
#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>
Index: src/sys/external/bsd/drm2/drm/drm_module.c
diff -u src/sys/external/bsd/drm2/drm/drm_module.c:1.23 src/sys/external/bsd/drm2/drm/drm_module.c:1.24
--- src/sys/external/bsd/drm2/drm/drm_module.c:1.23 Sun Dec 19 09:52:00 2021
+++ src/sys/external/bsd/drm2/drm/drm_module.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_module.c
#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"
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.14 src/sys/external/bsd/drm2/drm/drm_memory.c:1.15
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.14 Sun Dec 19 09:52:00 2021
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_memory.c
#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!
Index: src/sys/external/bsd/drm2/drm/drm_scatter.c
diff -u src/sys/external/bsd/drm2/drm/drm_scatter.c:1.7 src/sys/external/bsd/drm2/drm/drm_scatter.c:1.8
--- src/sys/external/bsd/drm2/drm/drm_scatter.c:1.7 Sun Dec 19 09:50:42 2021
+++ src/sys/external/bsd/drm2/drm/drm_scatter.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drm_scatter.
#include <linux/slab.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include "../dist/drm/drm_internal.h"
Index: src/sys/external/bsd/drm2/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.9 src/sys/external/bsd/drm2/drm/drmfb.c:1.10
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.9 Sun Dec 19 09:53:06 2021
+++ src/sys/external/bsd/drm2/drm/drmfb.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.
#include <dev/wsfb/genfbvar.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_fb_helper.h>
#include <drm/drmfb.h>
Index: src/sys/external/bsd/drm2/i915drm/i915_module.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_module.c:1.9 src/sys/external/bsd/drm2/i915drm/i915_module.c:1.10
--- src/sys/external/bsd/drm2/i915drm/i915_module.c:1.9 Sun Dec 19 01:41:35 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_module.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: i915_module.
#endif
#include <sys/systm.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_sysctl.h>
#include "i915_drv.h"
Index: src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.2 src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.3
--- src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c:1.2 Sun Dec 19 01:46:16 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_pci_autoconf.c Sun Dec 19 10:32:59 2021
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: i915_pci_aut
#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 {
Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.18 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.19
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.18 Sat Jun 12 12:15:43 2021
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Sun Dec 19 10:32:59 2021
@@ -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 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.18 2021/06/12 12:15:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.19 2021/12/19 10:32:59 riastradh Exp $");
#include <sys/types.h>
#include <sys/bus.h>
#include <sys/device.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drmfb.h>
#include <drm/drmfb_pci.h>
Index: src/sys/external/bsd/drm2/i915drm/intelfb.h
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.h:1.1 src/sys/external/bsd/drm2/i915drm/intelfb.h:1.2
--- src/sys/external/bsd/drm2/i915drm/intelfb.h:1.1 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/i915drm/intelfb.h Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.h,v 1.1 2014/07/24 21:18:40 riastradh Exp $ */
+/* $NetBSD: intelfb.h,v 1.2 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,9 +34,10 @@
#include <sys/bus.h>
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
+struct drm_device;
+
struct intelfb_attach_args {
struct drm_device *ifa_drm_dev;
struct drm_fb_helper *ifa_fb_helper;
Index: src/sys/external/bsd/drm2/include/amdgpufb.h
diff -u src/sys/external/bsd/drm2/include/amdgpufb.h:1.1 src/sys/external/bsd/drm2/include/amdgpufb.h:1.2
--- src/sys/external/bsd/drm2/include/amdgpufb.h:1.1 Mon Aug 27 14:02:32 2018
+++ src/sys/external/bsd/drm2/include/amdgpufb.h Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpufb.h,v 1.1 2018/08/27 14:02:32 riastradh Exp $ */
+/* $NetBSD: amdgpufb.h,v 1.2 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -34,9 +34,10 @@
#include <sys/bus.h>
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
+struct drm_device;
+
struct amdgpufb_attach_args {
struct drm_device *afa_drm_dev;
struct drm_fb_helper *afa_fb_helper;
Index: src/sys/external/bsd/drm2/nouveau/nouveau_module.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.9 src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.10
--- src/sys/external/bsd/drm2/nouveau/nouveau_module.c:1.9 Tue Aug 28 03:34:07 2018
+++ src/sys/external/bsd/drm2/nouveau/nouveau_module.c Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_module.c,v 1.9 2018/08/28 03:34:07 riastradh Exp $ */
+/* $NetBSD: nouveau_module.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.9 2018/08/28 03:34:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_module.c,v 1.10 2021/12/19 10:32:59 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
#include <sys/systm.h>
-#include <drm/drmP.h>
#include <drm/drm_sysctl.h>
#include <core/device.h>
Index: src/sys/external/bsd/drm2/nouveau/nouveau_pci.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.27 src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.28
--- src/sys/external/bsd/drm2/nouveau/nouveau_pci.c:1.27 Sun Dec 19 00:32:11 2021
+++ src/sys/external/bsd/drm2/nouveau/nouveau_pci.c Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_pci.c,v 1.27 2021/12/19 00:32:11 riastradh Exp $ */
+/* $NetBSD: nouveau_pci.c,v 1.28 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.27 2021/12/19 00:32:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_pci.c,v 1.28 2021/12/19 10:32:59 riastradh Exp $");
#ifdef _KERNEL_OPT
#if defined(__arm__) || defined(__aarch64__)
@@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_pci.
#include <sys/workqueue.h>
#include <sys/module.h>
-#include <drm/drmP.h>
-
#include <core/device.h>
#include <core/pci.h>
@@ -56,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: nouveau_pci.
#include "nouveau_drv.h"
#include "nouveau_pci.h"
+struct drm_device;
+
MODULE(MODULE_CLASS_DRIVER, nouveau_pci, "nouveau,drmkms_pci");
SIMPLEQ_HEAD(nouveau_pci_task_head, nouveau_pci_task);
Index: src/sys/external/bsd/drm2/nouveau/nouveaufb.c
diff -u src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.5 src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.6
--- src/sys/external/bsd/drm2/nouveau/nouveaufb.c:1.5 Sun Dec 19 00:32:11 2021
+++ src/sys/external/bsd/drm2/nouveau/nouveaufb.c Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveaufb.c,v 1.5 2021/12/19 00:32:11 riastradh Exp $ */
+/* $NetBSD: nouveaufb.c,v 1.6 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,14 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.5 2021/12/19 00:32:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveaufb.c,v 1.6 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>
Index: src/sys/external/bsd/drm2/nouveau/nouveaufb.h
diff -u src/sys/external/bsd/drm2/nouveau/nouveaufb.h:1.1 src/sys/external/bsd/drm2/nouveau/nouveaufb.h:1.2
--- src/sys/external/bsd/drm2/nouveau/nouveaufb.h:1.1 Fri Mar 6 01:43:07 2015
+++ src/sys/external/bsd/drm2/nouveau/nouveaufb.h Sun Dec 19 10:32:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveaufb.h,v 1.1 2015/03/06 01:43:07 riastradh Exp $ */
+/* $NetBSD: nouveaufb.h,v 1.2 2021/12/19 10:32:59 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,9 +34,10 @@
#include <sys/bus.h>
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
+struct drm_device;
+
struct nouveaufb_attach_args {
struct drm_device *nfa_drm_dev;
struct drm_fb_helper *nfa_fb_helper;
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.40 src/sys/external/bsd/drm2/pci/drm_pci.c:1.41
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.40 Sun Dec 19 09:55:40 2021
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_pci.c,v 1.40 2021/12/19 09:55:40 riastradh Exp $ */
+/* $NetBSD: drm_pci.c,v 1.41 2021/12/19 10:33:00 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.40 2021/12/19 09:55:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.41 2021/12/19 10:33:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -38,10 +38,10 @@ __KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v
#include <dev/pci/pcivar.h>
-#include <drm/drmP.h>
-#include <drm/drm_pci.h>
+#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_legacy.h>
+#include <drm/drm_pci.h>
#include "../dist/drm/drm_internal.h"
Index: src/sys/external/bsd/drm2/pci/drmfb_pci.c
diff -u src/sys/external/bsd/drm2/pci/drmfb_pci.c:1.3 src/sys/external/bsd/drm2/pci/drmfb_pci.c:1.4
--- src/sys/external/bsd/drm2/pci/drmfb_pci.c:1.3 Thu Mar 5 20:19:30 2015
+++ src/sys/external/bsd/drm2/pci/drmfb_pci.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb_pci.c,v 1.3 2015/03/05 20:19:30 christos Exp $ */
+/* $NetBSD: drmfb_pci.c,v 1.4 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drmfb_pci.c,v 1.3 2015/03/05 20:19:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb_pci.c,v 1.4 2021/12/19 10:33:00 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: drmfb_pci.c,
#include <dev/ic/vgavar.h>
#endif
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_fb_helper.h>
#include <drm/drmfb.h>
Index: src/sys/external/bsd/drm2/radeon/radeon_module.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_module.c:1.6 src/sys/external/bsd/drm2/radeon/radeon_module.c:1.7
--- src/sys/external/bsd/drm2/radeon/radeon_module.c:1.6 Sun Dec 19 09:56:17 2021
+++ src/sys/external/bsd/drm2/radeon/radeon_module.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_module.c,v 1.6 2021/12/19 09:56:17 riastradh Exp $ */
+/* $NetBSD: radeon_module.c,v 1.7 2021/12/19 10:33:00 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.6 2021/12/19 09:56:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_module.c,v 1.7 2021/12/19 10:33:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_modul
#endif
#include <sys/systm.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/drm_drv.h>
#include <drm/drm_sysctl.h>
Index: src/sys/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.16 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.17
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.16 Sun Dec 19 09:56:17 2021
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_pci.c,v 1.16 2021/12/19 09:56:17 riastradh Exp $ */
+/* $NetBSD: radeon_pci.c,v 1.17 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.16 2021/12/19 09:56:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_pci.c,v 1.17 2021/12/19 10:33:00 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -67,8 +67,9 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_pci.c
#include <dev/fdt/fdtvar.h>
#endif
-#include <drm/drm_pci.h>
+#include <drm/drm_device.h>
#include <drm/drm_fb_helper.h>
+#include <drm/drm_pci.h>
#include <radeon.h>
#include "radeon_drv.h"
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.14 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.15
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.14 Sun Dec 19 01:47:41 2021
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.14 2021/12/19 01:47:41 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.15 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,12 +31,11 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.14 2021/12/19 01:47:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.15 2021/12/19 10:33:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
#include <drm/drmfb.h>
#include <drm/drmfb_pci.h>
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.2 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.3
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.2 Tue Nov 18 09:28:36 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.h,v 1.2 2014/11/18 09:28:36 nonaka Exp $ */
+/* $NetBSD: radeondrmkmsfb.h,v 1.3 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
#ifndef _RADEON_RADEONDRMKMSFB_H_
#define _RADEON_RADEONDRMKMSFB_H_
-#include <drm/drmP.h>
#include <drm/drm_fb_helper.h>
+struct drm_device;
+
struct radeonfb_attach_args {
struct drm_fb_helper *rfa_fb_helper;
struct drm_fb_helper_surface_size rfa_fb_sizes;
Index: src/sys/external/bsd/drm2/via/via_module.c
diff -u src/sys/external/bsd/drm2/via/via_module.c:1.4 src/sys/external/bsd/drm2/via/via_module.c:1.5
--- src/sys/external/bsd/drm2/via/via_module.c:1.4 Tue Aug 28 03:35:08 2018
+++ src/sys/external/bsd/drm2/via/via_module.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: via_module.c,v 1.4 2018/08/28 03:35:08 riastradh Exp $ */
+/* $NetBSD: via_module.c,v 1.5 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_module.c,v 1.4 2018/08/28 03:35:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_module.c,v 1.5 2021/12/19 10:33:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/module.h>
#include <sys/once.h>
-#include <drm/drmP.h>
+#include <drm/drm_device.h>
#include <drm/via_drm.h>
#include "via_drv.h"
Index: src/sys/external/bsd/drm2/via/via_pci.c
diff -u src/sys/external/bsd/drm2/via/via_pci.c:1.5 src/sys/external/bsd/drm2/via/via_pci.c:1.6
--- src/sys/external/bsd/drm2/via/via_pci.c:1.5 Sat Feb 13 15:42:15 2021
+++ src/sys/external/bsd/drm2/via/via_pci.c Sun Dec 19 10:33:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: via_pci.c,v 1.5 2021/02/13 15:42:15 jakllsch Exp $ */
+/* $NetBSD: via_pci.c,v 1.6 2021/12/19 10:33:00 riastradh Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_pci.c,v 1.5 2021/02/13 15:42:15 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_pci.c,v 1.6 2021/12/19 10:33:00 riastradh Exp $");
#include <sys/types.h>
#include <sys/device.h>
@@ -39,12 +39,13 @@ __KERNEL_RCSID(0, "$NetBSD: via_pci.c,v
#include <linux/pci.h>
-#include <drm/drmP.h>
#include <drm/drm_pciids.h>
#include <drm/via_drm.h>
#include "via_drv.h"
+struct drm_device;
+
struct viadrm_softc {
device_t sc_dev;
struct pci_dev sc_pci_dev;
