summaryrefslogtreecommitdiff
path: root/sys/dev/drm
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2009-02-15 18:42:20 +0000
committerjmcneill <jmcneill@NetBSD.org>2009-02-15 18:42:20 +0000
commit2fa3d3184af12e4dd51baceeec33e53920a02ff2 (patch)
tree832d3920b7b3cef983e97ee69b71ad32e67c5cfd /sys/dev/drm
parentec798a6e6c36fbd7c248e64c92cbf9165e9060f5 (diff)
Use genfb_borrow; drm works with genfb now.
Diffstat (limited to 'sys/dev/drm')
-rw-r--r--sys/dev/drm/drm_memory.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/dev/drm/drm_memory.c b/sys/dev/drm/drm_memory.c
index b700f77e5e7..3499b5b706b 100644
--- a/sys/dev/drm/drm_memory.c
+++ b/sys/dev/drm/drm_memory.c
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.14 2008/06/29 12:49:08 jmcneill Exp $ */
+/* $NetBSD: drm_memory.c,v 1.15 2009/02/15 18:42:20 jmcneill Exp $ */
/* drm_memory.h -- Memory management wrappers for DRM -*- linux-c -*-
* Created: Thu Feb 4 14:00:34 1999 by faith@valinux.com
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.14 2008/06/29 12:49:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_memory.c,v 1.15 2009/02/15 18:42:20 jmcneill Exp $");
/*
__FBSDID("$FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.2 2005/11/28 23:13:52 anholt Exp $");
*/
@@ -54,6 +54,11 @@ __FBSDID("$FreeBSD: src/sys/dev/drm/drm_memory.c,v 1.2 2005/11/28 23:13:52 anhol
#endif
#endif
+#include "genfb.h"
+#if NGENFB > 0
+#include <dev/wsfb/genfbvar.h>
+#endif
+
#if !defined(_MODULE)
MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures");
#endif
@@ -127,6 +132,10 @@ void *drm_ioremap(drm_device_t *dev, drm_local_map_t *map)
if (agp_i810_borrow(map->offset, &map->bsh))
return bus_space_vaddr(map->bst, map->bsh);
#endif
+#if NGENFB > 0
+ if (genfb_borrow(map->offset, &map->bsh))
+ return bus_space_vaddr(map->bst, map->bsh);
+#endif
DRM_DEBUG("ioremap: failed to map (%d)\n",
reason);
return NULL;