Messages in this thread | | | Date | Tue, 14 Nov 2006 10:44:43 +0100 | From | "Franck Bui-Huu" <> | Subject | Re: [Linux-fbdev-devel] fbmem: is bootup logo broken for monochrome LCD ? |
| |
On 11/13/06, James Simmons <jsimmons@infradead.org> wrote: > > Let me know if it works now. >
OK I can apply it now.
> > diff -urN -X linus-2.6/Documentation/dontdiff linus-2.6/drivers/video/cfbimgblt.c fbdev-2.6/drivers/video/cfbimgblt.c > --- linus-2.6/drivers/video/cfbimgblt.c 2006-11-07 05:38:36.000000000 -0500 > +++ fbdev-2.6/drivers/video/cfbimgblt.c 2006-11-12 10:29:49.000000000 -0500
[snip]
> +static inline void slow_imageblit(const struct fb_image *image, > + struct fb_info *p, u8 __iomem *dst, > + u32 start_index, u32 pitch_index)
I still have my problem there: for example if image data are 0, 0, 0x54, 0, ...
then slow_imageblit() will write into the frame buffer, the following bytes: 0, 0, 0x2a, 0, ...
instead of the initial ones: 0, 0, 0x54, 0, ...
Bits of each bytes are reversed. I already tried to explain my problem, please look at
http://marc.theaimsgroup.com/?l=linux-kernel&m=116315548626875&w=2
> > diff -urN -X linus-2.6/Documentation/dontdiff linus-2.6/drivers/video/fbmem.c fbdev-2.6/drivers/video/fbmem.c
[snip]
> @@ -480,14 +436,13 @@ > int fb_show_logo(struct fb_info *info, int rotate) > { > u32 *palette = NULL, *saved_pseudo_palette = NULL; > - unsigned char *logo_new = NULL, *logo_rotate = NULL; > struct fb_image image; > > /* Return if the frame buffer is not mapped or suspended */ > if (fb_logo.logo == NULL || info->state != FBINFO_STATE_RUNNING) > return 0; > > - image.depth = 8; > + image.depth = fb_logo.depth; > image.data = fb_logo.logo->data; > > if (fb_logo.needs_cmapreset) > @@ -508,17 +463,13 @@ > info->pseudo_palette = palette; > } > > - if (fb_logo.depth <= 4) { > - logo_new = kmalloc(fb_logo.logo->width * fb_logo.logo->height, > - GFP_KERNEL); > - if (logo_new == NULL) { > - kfree(palette); > - if (saved_pseudo_palette) > - info->pseudo_palette = saved_pseudo_palette; > - return 0; > + if (fb_logo.depth == 1) { > + if (info->fix.visual == FB_VISUAL_MONO01) { > + u32 fg = image.fg_color; > + > + image.fg_color = image.bg_color; > + image.bg_color = fg;
I had to fix this part to make the bootup logo worked. image.fg_color is not uninitialised at this point. I had to change this part as follow:
if (fb_logo.depth == 1) { image.fg_color = (info->fix.visual == FB_VISUAL_MONO01) ? 1: 0; image.bg_color = !image.fg_color; }
Otherwise this part of your patch (the one which fix the logo display) seems ok for my naive look. It would be nice if this part could be sent in a single patch to Andrew. I already tried to fix it but your patch looks better.
Thanks -- Franck - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |