Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:54:38 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_pci.h
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
Move some drm PCI stuff off drmP.h
Author: Maya Rashish <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
cvs rdiff -u -r1.38 -r1.39 src/sys/external/bsd/drm2/pci/drm_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/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.64 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.65
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.64 Sun Dec 19 09:54:31 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 09:54:38 2021
@@ -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 @@ int drm_guarantee_initialized(void);
/*@}*/
-/* 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);
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.3 src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.4
--- src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h:1.3 Sun Dec 19 09:52:00 2021
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_pci.h Sun Dec 19 09:54:38 2021
@@ -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 @@ static inline int drm_get_pci_dev(struct
#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_ */
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.38 src/sys/external/bsd/drm2/pci/drm_pci.c:1.39
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.38 Sun Dec 19 09:51:12 2021
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Sun Dec 19 09:54:38 2021
@@ -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 @@ __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_drv.h>
#include <drm/drm_legacy.h>
