Module Name: src
Committed By: snj
Date: Sat Mar 21 08:46:05 UTC 2015
Modified Files:
src/sys/dev/wscons [netbsd-7]: wsconsio.h
src/sys/dev/wsfb [netbsd-7]: genfb.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #631):
sys/dev/wscons/wsconsio.h: revision 1.112 via patch
sys/dev/wsfb/genfb.c: revision 1.57
add WSDISPLAY_TYPE_MESON
--
support 24bpp framebuffers
To generate a diff of this commit:
cvs rdiff -u -r1.108.10.1 -r1.108.10.2 src/sys/dev/wscons/wsconsio.h
cvs rdiff -u -r1.55.2.1 -r1.55.2.2 src/sys/dev/wsfb/genfb.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/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.108.10.1 src/sys/dev/wscons/wsconsio.h:1.108.10.2
--- src/sys/dev/wscons/wsconsio.h:1.108.10.1 Fri Nov 14 13:26:46 2014
+++ src/sys/dev/wscons/wsconsio.h Sat Mar 21 08:46:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.108.10.1 2014/11/14 13:26:46 martin Exp $ */
+/* $NetBSD: wsconsio.h,v 1.108.10.2 2015/03/21 08:46:05 snj Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -335,6 +335,7 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_WINDERMERE 58 /* SoC for EPOC32 Series 5mx */
#define WSDISPLAY_TYPE_CLPS711X 59 /* CL PS-711x */
#define WSDISPLAY_TYPE_ALLWINNER 60 /* Allwinner ARM SoC */
+#define WSDISPLAY_TYPE_MESON 62 /* Amlogic Meson ARM Soc */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.55.2.1 src/sys/dev/wsfb/genfb.c:1.55.2.2
--- src/sys/dev/wsfb/genfb.c:1.55.2.1 Fri Oct 3 16:22:58 2014
+++ src/sys/dev/wsfb/genfb.c Sat Mar 21 08:46:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.55.2.1 2014/10/03 16:22:58 martin Exp $ */
+/* $NetBSD: genfb.c,v 1.55.2.2 2015/03/21 08:46:05 snj Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.55.2.1 2014/10/03 16:22:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.55.2.2 2015/03/21 08:46:05 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -545,10 +545,12 @@ genfb_init_screen(void *cookie, struct v
ri->ri_flg |= RI_CLEAR;
}
- if (ri->ri_depth == 32) {
+ if (ri->ri_depth == 32 || ri->ri_depth == 24) {
bool is_bgr = false;
- ri->ri_flg |= RI_ENABLE_ALPHA;
+ if (ri->ri_depth == 32) {
+ ri->ri_flg |= RI_ENABLE_ALPHA;
+ }
prop_dictionary_get_bool(device_properties(sc->sc_dev),
"is_bgr", &is_bgr);
if (is_bgr) {
@@ -568,7 +570,7 @@ genfb_init_screen(void *cookie, struct v
ri->ri_gpos = 8;
ri->ri_bpos = 0;
}
- }
+ }
if (ri->ri_depth == 8 && sc->sc_cmcb != NULL)
ri->ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB;
