[src/trunk]: src/sys/external/bsd/drm2/dist/include/drm Move drm_limit_dma_sp...

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

details:   https://anonhg.NetBSD.org/src/rev/cdea70e9fc44
branches:  trunk
changeset: 992777:cdea70e9fc44
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:46:07 2018 +0000

description:
Move drm_limit_dma_space to drmP.h -- not legacy, used by drivers.

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h       |  6 +++++-
 sys/external/bsd/drm2/dist/include/drm/drm_legacy.h |  5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 25a34aa6ccba -r cdea70e9fc44 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 07:45:55 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Mon Aug 27 07:46:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.22 2018/08/27 07:03:26 riastradh Exp $      */
+/*     $NetBSD: drmP.h,v 1.23 2018/08/27 07:46:07 riastradh Exp $      */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -1207,6 +1207,10 @@
 struct drm_minor *drm_minor_acquire(unsigned int minor_id);
 void drm_minor_release(struct drm_minor *minor);
 
+#ifdef __NetBSD__
+int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t);
+#endif
+
 /*@}*/
 
 /* PCI section */
diff -r 25a34aa6ccba -r cdea70e9fc44 sys/external/bsd/drm2/dist/include/drm/drm_legacy.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h       Mon Aug 27 07:45:55 2018 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h       Mon Aug 27 07:46:07 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_legacy.h,v 1.5 2018/08/27 06:42:54 riastradh Exp $ */
+/*     $NetBSD: drm_legacy.h,v 1.6 2018/08/27 07:46:07 riastradh Exp $ */
 
 #ifndef __DRM_DRM_LEGACY_H__
 #define __DRM_DRM_LEGACY_H__
@@ -252,9 +252,6 @@
 void __drm_legacy_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
 
 /* drm_memory.c */
-#ifdef __NetBSD__
-int drm_limit_dma_space(struct drm_device *, resource_size_t, resource_size_t);
-#endif
 void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev);
 void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);
 void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);