[src/trunk]: src/sys/arch/arm/omap implement omapfb_mmap() - now X with wsfb ...

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

details:   https://anonhg.NetBSD.org/src/rev/79d27ba64e7a
branches:  trunk
changeset: 783832:79d27ba64e7a
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Jan 10 02:18:06 2013 +0000

description:
implement omapfb_mmap() - now X with wsfb works

diffstat:

 sys/arch/arm/omap/omapfb.c |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r d237424e5f90 -r 79d27ba64e7a sys/arch/arm/omap/omapfb.c
--- a/sys/arch/arm/omap/omapfb.c        Thu Jan 10 02:14:42 2013 +0000
+++ b/sys/arch/arm/omap/omapfb.c        Thu Jan 10 02:18:06 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omapfb.c,v 1.9 2013/01/09 04:52:47 macallan Exp $      */
+/*     $NetBSD: omapfb.c,v 1.10 2013/01/10 02:18:06 macallan Exp $     */
 
 /*
  * Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.9 2013/01/09 04:52:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1.10 2013/01/10 02:18:06 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,17 +481,15 @@
 omapfb_mmap(void *v, void *vs, off_t offset, int prot)
 {
        paddr_t pa = -1;
-#if 0
        struct vcons_data *vd = v;
        struct omapfb_softc *sc = vd->cookie;
 
        /* 'regular' framebuffer mmap()ing */
-       if (offset < sc->sc_fbsize) {
-               pa = bus_space_mmap(sc->sc_memt, sc->sc_fb + offset, 0, prot,
-                   BUS_SPACE_MAP_LINEAR);
+       if (offset < (12 << 20)) {
+               pa = bus_dmamem_mmap(sc->sc_dmat, sc->sc_dmamem, 1,
+                   offset + 0x1000, prot, BUS_DMA_COHERENT);
                return pa;
        }
-#endif
        return pa;
 }