[src/trunk]: src/sys/external/bsd/drm/dist/bsd-core Make DRM work with genfb ...

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

details:   https://anonhg.NetBSD.org/src/rev/d5cd3d6da3dd
branches:  trunk
changeset: 761929:d5cd3d6da3dd
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Feb 11 01:13:02 2011 +0000

description:
Make DRM work with genfb again.

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drm_memory.c |  9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diffs (33 lines):

diff -r b6ba901d9080 -r d5cd3d6da3dd sys/external/bsd/drm/dist/bsd-core/drm_memory.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Fri Feb 11 00:21:18 2011 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_memory.c   Fri Feb 11 01:13:02 2011 +0000
@@ -44,13 +44,18 @@
 # else
 #  if defined(_KERNEL_OPT)
 #    include "agp_i810.h"
+#    include "genfb.h"
 #  else
 #   define NAGP_I810 1
+#   define NGENFB 1
 #  endif
 # endif
 # if NAGP_I810 > 0
 #  include <dev/pci/agpvar.h>
 # endif
+# if NGENFB > 0
+#  include <dev/wsfb/genfbvar.h>
+# endif
 #endif
 
 MALLOC_DEFINE(DRM_MEM_DMA, "drm_dma", "DRM DMA Data Structures");
@@ -140,6 +145,10 @@
                                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;