From 2fa3d3184af12e4dd51baceeec33e53920a02ff2 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Sun, 15 Feb 2009 18:42:20 +0000 Subject: Use genfb_borrow; drm works with genfb now. --- sys/dev/drm/drm_memory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'sys/dev') 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 -__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 +#endif + #if !defined(_MODULE) MALLOC_DEFINE(M_DRM, "drm", "DRM Data Structures"); #endif @@ -126,6 +131,10 @@ void *drm_ioremap(drm_device_t *dev, drm_local_map_t *map) #if NAGP_I810 > 0 /* XXX horrible kludge: agp might have mapped it */ 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); -- cgit