Module Name: src Committed By: rin Date: Mon Oct 19 01:13:41 UTC 2020
Modified Files: src/sys/arch/arm/sunxi: sunxi_debe.c Log Message: sunxi_debe_set_videomode(): As byte-swapped framebuffer is now handled by FDT override, do not configure FB to little-endian format for __ARMEB__. XXX This function is not actually called at the moment. IIRC, it worked in the pre-FDT era. Something went wrong since then... To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sunxi/sunxi_debe.c 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/sunxi/sunxi_debe.c diff -u src/sys/arch/arm/sunxi/sunxi_debe.c:1.9 src/sys/arch/arm/sunxi/sunxi_debe.c:1.10 --- src/sys/arch/arm/sunxi/sunxi_debe.c:1.9 Fri Jun 1 17:18:44 2018 +++ src/sys/arch/arm/sunxi/sunxi_debe.c Mon Oct 19 01:13:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_debe.c,v 1.9 2018/06/01 17:18:44 bouyer Exp $ */ +/* $NetBSD: sunxi_debe.c,v 1.10 2020/10/19 01:13:41 rin Exp $ */ /*- * Copyright (c) 2018 Manuel Bouyer <bou...@antioche.eu.org> @@ -38,7 +38,7 @@ #define SUNXI_DEBE_CURMAX 64 #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.9 2018/06/01 17:18:44 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_debe.c,v 1.10 2020/10/19 01:13:41 rin Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -560,6 +560,10 @@ sunxi_debe_ep_enable(device_t dev, struc return 0; } +/* + * FIXME 2020/10/19 + * This function is not called actually at the moment. + */ void sunxi_debe_set_videomode(device_t dev, const struct videomode *mode) { @@ -613,7 +617,12 @@ sunxi_debe_set_videomode(device_t dev, c SUNXI_DEBE_ATTCTL1_LAY_FBFMT); val &= ~SUNXI_DEBE_ATTCTL1_LAY_BRSWAPEN; val &= ~SUNXI_DEBE_ATTCTL1_LAY_FBPS; -#if __ARMEB__ +#if 0 /* __ARMEB__ */ + /* + * For big endian, we dynamically override FDT to let + * genfb(4) know that framebuffer is byte-swapped. + * See fdt_update_fb_format() in fdt_machdep.c. + */ val |= __SHIFTIN(SUNXI_DEBE_ATTCTL1_LAY_FBPS_32BPP_BGRA, SUNXI_DEBE_ATTCTL1_LAY_FBPS); #else