Module Name: src Committed By: riastradh Date: Sun Dec 19 01:49:00 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/include/drm: drmP.h drm_cache.h Log Message: These declarations moved to drm_cache.h, move them along. Author: Maya Rashish <m...@netbsd.org> To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 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_cache.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.45 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.46 --- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.45 Sun Dec 19 01:34:39 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Sun Dec 19 01:49:00 2021 @@ -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_noop(struct drm_device *dev, voi 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. Index: src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h diff -u src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.5 src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.6 --- src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h:1.5 Sat Dec 18 23:45:45 2021 +++ src/sys/external/bsd/drm2/dist/include/drm/drm_cache.h Sun Dec 19 01:49:00 2021 @@ -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);