Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:46:07 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_legacy.h
Log Message:
Move drm_limit_dma_space to drmP.h -- not legacy, used by drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h
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.22 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.23
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.22 Mon Aug 27 07:03:26 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Mon Aug 27 07:46:07 2018
@@ -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 @@ int drm_dev_set_unique(struct drm_device
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 */
Index: src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.6
--- src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h:1.5 Mon Aug 27 06:42:54 2018
+++ src/sys/external/bsd/drm2/dist/include/drm/drm_legacy.h Mon Aug 27 07:46:07 2018
@@ -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_idlelock_release(struct
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);
