Module Name: src
Committed By: martin
Date: Tue Dec 9 19:21:09 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_debe.c awin_reg.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.5 -r1.6.2.6 src/sys/arch/arm/allwinner/awin_debe.c
cvs rdiff -u -r1.14.2.9 -r1.14.2.10 src/sys/arch/arm/allwinner/awin_reg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_debe.c
diff -u src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.5 src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.6
--- src/sys/arch/arm/allwinner/awin_debe.c:1.6.2.5 Mon Dec 1 13:23:49 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Tue Dec 9 19:21:09 2014
@@ -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 <[email protected]>
@@ -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_set_videomode(const struct vid
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);
Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.9 src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.10
--- src/sys/arch/arm/allwinner/awin_reg.h:1.14.2.9 Thu Dec 4 11:08:38 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Tue Dec 9 19:21:09 2014
@@ -1710,6 +1710,8 @@ struct awin_mmc_idma_descriptor {
#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)
