[src/trunk]: src/sys/external/bsd/drm2/pci Move some drm PCI stuff off drmP.h

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

details:   https://anonhg.NetBSD.org/src/rev/9f8450b5bb24
branches:  trunk
changeset: 1028238:9f8450b5bb24
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:54:38 2021 +0000

description:
Move some drm PCI stuff off drmP.h


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h    |  18 +-----------------
 sys/external/bsd/drm2/dist/include/drm/drm_pci.h |  11 ++++++++++-
 sys/external/bsd/drm2/pci/drm_pci.c              |   5 +++--
 3 files changed, 14 insertions(+), 20 deletions(-)

diffs (81 lines):

diff -r 98b30073c907 -r 9f8450b5bb24 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Sun Dec 19 09:54:31 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Sun Dec 19 09:54:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.64 2021/12/19 09:54:31 riastradh Exp $      */
+/*     $NetBSD: drmP.h,v 1.65 2021/12/19 09:54:38 riastradh Exp $      */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -149,22 +149,6 @@
 
 /*@}*/
 
-/* PCI section */
-void drm_pci_agp_destroy(struct drm_device *dev);
-
-extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
-extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
-#ifdef __NetBSD__
-int drm_pci_request_irq(struct drm_device *, int);
-void drm_pci_free_irq(struct drm_device *);
-extern int drm_pci_attach(device_t, const struct pci_attach_args *,
-    struct pci_dev *, struct drm_driver *, unsigned long,
-    struct drm_device **);
-extern int drm_pci_detach(struct drm_device *, int);
-#endif
-
-extern int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *speed_mask);
-
 /* platform section */
 extern int drm_platform_init(struct drm_driver *driver, struct platform_device *platform_device);
 extern int drm_platform_set_busid(struct drm_device *d, struct drm_master *m);
diff -r 98b30073c907 -r 9f8450b5bb24 sys/external/bsd/drm2/dist/include/drm/drm_pci.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 09:54:31 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_pci.h  Sun Dec 19 09:54:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.h,v 1.3 2021/12/19 09:52:00 riastradh Exp $    */
+/*     $NetBSD: drm_pci.h,v 1.4 2021/12/19 09:54:38 riastradh Exp $    */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -74,4 +74,13 @@
 
 #endif
 
+#ifdef __NetBSD__
+int drm_pci_request_irq(struct drm_device *, int);
+void drm_pci_free_irq(struct drm_device *);
+extern int drm_pci_attach(device_t, const struct pci_attach_args *,
+    struct pci_dev *, struct drm_driver *, unsigned long,
+    struct drm_device **);
+extern int drm_pci_detach(struct drm_device *, int);
+#endif
+
 #endif /* _DRM_PCI_H_ */
diff -r 98b30073c907 -r 9f8450b5bb24 sys/external/bsd/drm2/pci/drm_pci.c
--- a/sys/external/bsd/drm2/pci/drm_pci.c       Sun Dec 19 09:54:31 2021 +0000
+++ b/sys/external/bsd/drm2/pci/drm_pci.c       Sun Dec 19 09:54:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.c,v 1.38 2021/12/19 09:51:12 riastradh Exp $   */
+/*     $NetBSD: drm_pci.c,v 1.39 2021/12/19 09:54:38 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.38 2021/12/19 09:51:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.39 2021/12/19 09:54:38 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -39,6 +39,7 @@
 #include <dev/pci/pcivar.h>
 
 #include <drm/drmP.h>
+#include <drm/drm_pci.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_legacy.h>