[src/trunk]: src/sys/external/bsd/drm2/dist/include/drm These declarations mo...

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

details:   https://anonhg.NetBSD.org/src/rev/d44329d6c906
branches:  trunk
changeset: 1028084:d44329d6c906
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 01:49:00 2021 +0000

description:
These declarations moved to drm_cache.h, move them along.


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

diffstat:

 sys/external/bsd/drm2/dist/include/drm/drmP.h      |  13 +------------
 sys/external/bsd/drm2/dist/include/drm/drm_cache.h |   8 +++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)

diffs (51 lines):

diff -r 51d22ed99674 -r d44329d6c906 sys/external/bsd/drm2/dist/include/drm/drmP.h
--- a/sys/external/bsd/drm2/dist/include/drm/drmP.h     Sun Dec 19 01:48:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drmP.h     Sun Dec 19 01:49:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drmP.h,v 1.45 2021/12/19 01:34:39 riastradh Exp $      */
+/*     $NetBSD: drmP.h,v 1.46 2021/12/19 01:49:00 riastradh Exp $      */
 
 /*
  * Internal Header for the Direct Rendering Manager
@@ -1041,17 +1041,6 @@
 int drm_invalid_op(struct drm_device *dev, void *data,
                   struct drm_file *file_priv);
 
-/* Cache management (drm_cache.c) */
-void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
-#ifdef __NetBSD__              /* XXX drm clflush */
-void drm_clflush_pglist(struct pglist *);
-void drm_clflush_page(struct page *);
-void drm_clflush_virt_range(const void *, size_t);
-#else
-void drm_clflush_sg(struct sg_table *st);
-void drm_clflush_virt_range(void *addr, unsigned long length);
-#endif
-
 /*
  * These are exported to drivers so that they can implement fencing using
  * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
diff -r 51d22ed99674 -r d44329d6c906 sys/external/bsd/drm2/dist/include/drm/drm_cache.h
--- a/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sun Dec 19 01:48:52 2021 +0000
+++ b/sys/external/bsd/drm2/dist/include/drm/drm_cache.h        Sun Dec 19 01:49:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_cache.h,v 1.5 2021/12/18 23:45:45 riastradh Exp $  */
+/*     $NetBSD: drm_cache.h,v 1.6 2021/12/19 01:49:00 riastradh Exp $  */
 
 /**************************************************************************
  *
@@ -41,8 +41,14 @@
 #include <linux/scatterlist.h>
 
 void drm_clflush_pages(struct page *pages[], unsigned long num_pages);
+#ifdef __NetBSD__              /* XXX drm clflush */
+void drm_clflush_pglist(struct pglist *);
+void drm_clflush_page(struct page *);
+void drm_clflush_virt_range(const void *, size_t);
+#else
 void drm_clflush_sg(struct sg_table *st);
 void drm_clflush_virt_range(void *addr, unsigned long length);
+#endif
 bool drm_need_swiotlb(int dma_bits);