[src/netbsd-7]: src/sys/arch/arm/allwinner Pull up following revision(s) (req...

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

details:   https://anonhg.NetBSD.org/src/rev/05c9d6238fc5
branches:  netbsd-7
changeset: 798650:05c9d6238fc5
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 01 13:30:37 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #285):
        sys/arch/arm/allwinner/awin_fb.c: revision 1.8
make the full amount of reserved video memory available to userland

diffstat:

 sys/arch/arm/allwinner/awin_fb.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r de6704ffa511 -r 05c9d6238fc5 sys/arch/arm/allwinner/awin_fb.c
--- a/sys/arch/arm/allwinner/awin_fb.c  Mon Dec 01 13:23:49 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_fb.c  Mon Dec 01 13:30:37 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_fb.c,v 1.4.2.5 2014/12/01 13:23:49 martin Exp $ */
+/* $NetBSD: awin_fb.c,v 1.4.2.6 2014/12/01 13:30:37 martin Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_fb.c,v 1.4.2.5 2014/12/01 13:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_fb.c,v 1.4.2.6 2014/12/01 13:30:37 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,8 +143,10 @@
                fbi = data;
                ri = &sc->sc_gen.vd.active->scr_ri;
                error = wsdisplayio_get_fbinfo(ri, fbi);
-               if (error == 0)
+               if (error == 0) {
                        fbi->fbi_flags |= WSFB_VRAM_IS_RAM;
+                       fbi->fbi_fbsize = sc->sc_dmasegs[0].ds_len;
+               }
                return error;
        case WSDISPLAYIO_SVIDEO:
        case WSDISPLAYIO_GVIDEO:
@@ -163,7 +165,7 @@
 {
        struct awin_fb_softc *sc = v;
 
-       if (off < 0 || off >= sc->sc_gen.sc_fbsize)
+       if (off < 0 || off >= sc->sc_dmasegs[0].ds_len)
                return -1;
 
        return bus_dmamem_mmap(sc->sc_dmat, sc->sc_dmasegs, sc->sc_ndmasegs,