[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/3a43b673252b
branches:  netbsd-7
changeset: 798677:3a43b673252b
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 09 19:21:09 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #301):
        sys/arch/arm/allwinner/awin_reg.h: revision 1.72
        sys/arch/arm/allwinner/awin_debe.c: revision 1.12
Set BGRA pixel sequence if __ARMEB__ is defined.

diffstat:

 sys/arch/arm/allwinner/awin_debe.c |  11 +++++++++--
 sys/arch/arm/allwinner/awin_reg.h  |   2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (44 lines):

diff -r 10cad02079d1 -r 3a43b673252b sys/arch/arm/allwinner/awin_debe.c
--- a/sys/arch/arm/allwinner/awin_debe.c        Tue Dec 09 19:17:50 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_debe.c        Tue Dec 09 19:21:09 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.6.2.5 2014/12/01 13:23:49 martin Exp $ */
+/* $NetBSD: awin_debe.c,v 1.6.2.6 2014/12/09 19:21:09 martin Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -36,7 +36,7 @@
 #define AWIN_DEBE_CURMAX       64
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.6.2.5 2014/12/01 13:23:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.6.2.6 2014/12/09 19:21:09 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -473,6 +473,13 @@
                                 AWIN_DEBE_ATTCTL1_LAY_FBFMT);
                val &= ~AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN;
                val &= ~AWIN_DEBE_ATTCTL1_LAY_FBPS;
+#if __ARMEB__
+               val |= __SHIFTIN(AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_BGRA,
+                                AWIN_DEBE_ATTCTL1_LAY_FBPS);
+#else
+               val |= __SHIFTIN(AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_ARGB,
+                                AWIN_DEBE_ATTCTL1_LAY_FBPS);
+#endif
                DEBE_WRITE(sc, AWIN_DEBE_ATTCTL1_REG, val);
 
                val = DEBE_READ(sc, AWIN_DEBE_MODCTL_REG);
diff -r 10cad02079d1 -r 3a43b673252b sys/arch/arm/allwinner/awin_reg.h
--- a/sys/arch/arm/allwinner/awin_reg.h Tue Dec 09 19:17:50 2014 +0000
+++ b/sys/arch/arm/allwinner/awin_reg.h Tue Dec 09 19:21:09 2014 +0000
@@ -1710,6 +1710,8 @@
 #define AWIN_DEBE_ATTCTL1_LAY_FBFMT_RGBA4444   13
 #define AWIN_DEBE_ATTCTL1_LAY_BRSWAPEN __BIT(2)
 #define AWIN_DEBE_ATTCTL1_LAY_FBPS     __BITS(1,0)
+#define AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_ARGB  0
+#define AWIN_DEBE_ATTCTL1_LAY_FBPS_32BPP_BGRA  2
 
 #define AWIN_DEBE_REGBUFFCTL_REGAUTOLOAD_DIS __BIT(1)
 #define AWIN_DEBE_REGBUFFCTL_REGLOADCTL        __BIT(0)