The patch titled
fbmem: is bootup logo broken for monochrome LCD ?
has been added to the -mm tree. Its filename is
fbmem-is-bootup-logo-broken-for-monochrome-lcd.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fbmem: is bootup logo broken for monochrome LCD ?
From: Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
I'm trying to display the bootup logo on a monochrome LCD (1 bit per
pixel). I had to hack fbmem.c in a couple of place to make it work.
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/video/fbmem.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff -puN drivers/video/fbmem.c~fbmem-is-bootup-logo-broken-for-monochrome-lcd drivers/video/fbmem.c
--- a/drivers/video/fbmem.c~fbmem-is-bootup-logo-broken-for-monochrome-lcd
+++ a/drivers/video/fbmem.c
@@ -247,6 +247,7 @@ static void fb_set_logo(struct fb_info *
const struct linux_logo *logo, u8 *dst,
int depth)
{
+ u32 bpp = info->var.bits_per_pixel;
int i, j, k;
const u8 *src = logo->data;
u8 xor = (info->fix.visual == FB_VISUAL_MONO01) ? 0xff : 0;
@@ -275,9 +276,14 @@ static void fb_set_logo(struct fb_info *
for (i = 0; i < logo->height; i++) {
for (j = 0; j < logo->width; src++) {
d = *src ^ xor;
- for (k = 7; k >= 0; k--) {
- *dst++ = ((d >> k) & 1) ? fg : 0;
+ if (bpp == 1) {
+ *dst++ = d;
j++;
+ } else {
+ for (k = 7; k >= 0; k--) {
+ *dst++ = ((d >> k) & 1) ? fg : 0;
+ j++;
+ }
}
}
}
@@ -487,7 +493,6 @@ int fb_show_logo(struct fb_info *info, i
if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING)
return 0;
- image.depth = 8;
image.data = fb_logo.logo->data;
if (fb_logo.needs_cmapreset)
@@ -506,6 +511,9 @@ int fb_show_logo(struct fb_info *info, i
saved_pseudo_palette = info->pseudo_palette;
info->pseudo_palette = palette;
+ } else {
+ image.fg_color = 1;
+ image.bg_color = 0;
}
if (fb_logo.depth <= 4) {
@@ -525,6 +533,7 @@ int fb_show_logo(struct fb_info *info, i
image.dy = 0;
image.width = fb_logo.logo->width;
image.height = fb_logo.logo->height;
+ image.depth = fb_logo.depth;
if (rotate) {
logo_rotate = kmalloc(fb_logo.logo->width *
_
Patches currently in -mm which might be from vagabon.xyz@xxxxxxxxx are
git-mips.patch
fbmem-is-bootup-logo-broken-for-monochrome-lcd.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
