[src/trunk]: src/sys/arch/arm/allwinner On 2GB systems, we have to subtract A...

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

details:   https://anonhg.NetBSD.org/src/rev/938fa912f84b
branches:  trunk
changeset: 803805:938fa912f84b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Nov 12 23:12:27 2014 +0000

description:
On 2GB systems, we have to subtract AWIN_SDRAM_PBASE from the physical address.

diffstat:

 sys/arch/arm/allwinner/awin_debe.c |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 544c07875c39 -r 938fa912f84b sys/arch/arm/allwinner/awin_debe.c
--- a/sys/arch/arm/allwinner/awin_debe.c        Wed Nov 12 22:23:38 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_debe.c        Wed Nov 12 23:12:27 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $ */
+/* $NetBSD: awin_debe.c,v 1.5 2014/11/12 23:12:27 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.4 2014/11/11 19:22:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.5 2014/11/12 23:12:27 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -293,6 +293,14 @@
                        return;
                }
 
+               paddr_t pa = sc->sc_dmamap->dm_segs[0].ds_addr;
+               /*
+                * On 2GB systems, we need to subtract AWIN_SDRAM_PBASE from
+                * the phys addr.
+                */
+               if (pa >= AWIN_SDRAM_PBASE)
+                       pa -= AWIN_SDRAM_PBASE;
+
                /* notify fb */
                awin_debe_setup_fbdev(sc, mode);
 
@@ -301,10 +309,8 @@
                DEBE_WRITE(sc, AWIN_DEBE_LAYSIZE_REG,
                    ((mode->vdisplay - 1) << 16) | (mode->hdisplay - 1));
                DEBE_WRITE(sc, AWIN_DEBE_LAYLINEWIDTH_REG, mode->hdisplay << 5);
-               DEBE_WRITE(sc, AWIN_DEBE_LAYFB_L32ADD_REG,
-                   sc->sc_dmamap->dm_segs[0].ds_addr << 3);
-               DEBE_WRITE(sc, AWIN_DEBE_LAYFB_H4ADD_REG,
-                   sc->sc_dmamap->dm_segs[0].ds_addr >> 29);
+               DEBE_WRITE(sc, AWIN_DEBE_LAYFB_L32ADD_REG, pa << 3);
+               DEBE_WRITE(sc, AWIN_DEBE_LAYFB_H4ADD_REG, pa >> 29);
 
                val = DEBE_READ(sc, AWIN_DEBE_ATTCTL1_REG);
                val &= ~AWIN_DEBE_ATTCTL1_LAY_FBFMT;