Module Name: src
Committed By: jmcneill
Date: Mon Dec 8 10:48:23 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_debe.c awin_reg.h
Log Message:
Set BGRA pixel sequence if __ARMEB__ is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/allwinner/awin_debe.c
cvs rdiff -u -r1.71 -r1.72 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.11 src/sys/arch/arm/allwinner/awin_debe.c:1.12
--- src/sys/arch/arm/allwinner/awin_debe.c:1.11 Thu Dec 4 11:16:38 2014
+++ src/sys/arch/arm/allwinner/awin_debe.c Mon Dec 8 10:48:22 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_debe.c,v 1.11 2014/12/04 11:16:38 jmcneill Exp $ */
+/* $NetBSD: awin_debe.c,v 1.12 2014/12/08 10:48:22 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -37,7 +37,7 @@
#define AWIN_DEBE_CURMAX 64
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.11 2014/12/04 11:16:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_debe.c,v 1.12 2014/12/08 10:48:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -487,6 +487,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.71 src/sys/arch/arm/allwinner/awin_reg.h:1.72
--- src/sys/arch/arm/allwinner/awin_reg.h:1.71 Sun Dec 7 18:32:13 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h Mon Dec 8 10:48:22 2014
@@ -1727,6 +1727,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)
