Module Name: src
Committed By: jmcneill
Date: Sat Oct 17 21:11:06 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/include/drm: bus_dma_hacks.h
Log Message:
use VM_FREELIST_DEFAULT on arm
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.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/include/drm/bus_dma_hacks.h
diff -u src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.7 src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.8
--- src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h:1.7 Sat Jul 26 14:27:40 2014
+++ src/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h Sat Oct 17 21:11:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma_hacks.h,v 1.7 2014/07/26 14:27:40 riastradh Exp $ */
+/* $NetBSD: bus_dma_hacks.h,v 1.8 2015/10/17 21:11:06 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,13 +40,13 @@
#include <uvm/uvm.h>
#include <uvm/uvm_extern.h>
-/* XXX This is x86-specific bollocks. */
-#if !defined(__i386__) && !defined(__x86_64__)
-#error DRM GEM/TTM need new MI bus_dma APIs! Halp!
-#endif
-
+#if defined(__i386__) || defined(__x86_64__)
#include <x86/bus_private.h>
#include <x86/machdep.h>
+#elif defined(__arm__)
+#else
+#error DRM GEM/TTM need new MI bus_dma APIs! Halp!
+#endif
static inline int
bus_dmamem_wire_uvm_object(bus_dma_tag_t tag, struct uvm_object *uobj,
@@ -116,7 +116,11 @@ bus_dmamem_unwire_uvm_object(bus_dma_tag
static inline int
bus_dmamem_pgfl(bus_dma_tag_t tag)
{
+#if defined(__i386__) || defined(__x86_64__)
return x86_select_freelist(tag->_bounce_alloc_hi - 1);
+#else
+ return VM_FREELIST_DEFAULT;
+#endif
}
static inline int
