Menu
▾
▴
linux-fbdev-devel
|
From: Antonino D. <ad...@po...> - 2003-02-16 06:11:50
Attachments:
logo1.diff
|
The attached patch (linux-2.5.61 + James' fbdev.diff) fixes the following: 1. compile error because of missing scripts/pmntologo. 2. Break up of fb_show_logo() to fb_prepare_logo()/fb_show_logo() to fix weird "double drawing" or the "single draw, erase in a flash" of the logo. 3. Fixed all drivers affected by the (image.depth == 0) is color expansion. Tony |
|
From: Antonino D. <ad...@po...> - 2003-02-16 11:13:06
|
On Sun, 2003-02-16 at 14:08, Antonino Daplas wrote:
> The attached patch (linux-2.5.61 + James' fbdev.diff) fixes the following:
>
> 1. compile error because of missing scripts/pmntologo.
>
> 2. Break up of fb_show_logo() to fb_prepare_logo()/fb_show_logo() to fix
> weird "double drawing" or the "single draw, erase in a flash" of the
> logo.
>
> 3. Fixed all drivers affected by the (image.depth == 0) is color
> expansion.
>
Here's an incremental diff to protect logo drawing code with an
#ifdef CONFIG_FB_LOGO
Tony
diff -Naur linux-2.5.61-fbdev/drivers/video/fbmem.c linux-2.5.61-ad/drivers/video/fbmem.c
--- linux-2.5.61-fbdev/drivers/video/fbmem.c 2003-02-16 11:08:40.000000000 +0000
+++ linux-2.5.61-ad/drivers/video/fbmem.c 2003-02-16 11:08:19.000000000 +0000
@@ -41,7 +41,6 @@
#include <asm/pgtable.h>
#include <linux/fb.h>
-#include <linux/linux_logo.h>
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
#include "console/fbcon.h"
@@ -369,6 +368,9 @@
return n < 0 ? d >> -n : d << n;
}
+#ifdef CONFIG_FB_LOGO
+#include <linux/linux_logo.h>
+
static void __init fb_set_logocmap(struct fb_info *info,
const struct linux_logo *logo)
{
@@ -656,6 +658,10 @@
kfree(logo_new);
return fb_logo.logo->height;
}
+#else
+int fb_prepare_logo(struct fb_info *info) { return 0; }
+int fb_show_logo(struct fb_info *info) { return 0; }
+#endif /* CONFIG_FB_LOGO */
static int fbmem_read_proc(char *buf, char **start, off_t offset,
int len, int *eof, void *private)
|
|
From: James S. <jsi...@in...> - 2003-02-16 16:41:14
|
Applied.
On 16 Feb 2003, Antonino Daplas wrote:
> On Sun, 2003-02-16 at 14:08, Antonino Daplas wrote:
> > The attached patch (linux-2.5.61 + James' fbdev.diff) fixes the following:
> >
> > 1. compile error because of missing scripts/pmntologo.
> >
> > 2. Break up of fb_show_logo() to fb_prepare_logo()/fb_show_logo() to fix
> > weird "double drawing" or the "single draw, erase in a flash" of the
> > logo.
> >
> > 3. Fixed all drivers affected by the (image.depth == 0) is color
> > expansion.
> >
>
> Here's an incremental diff to protect logo drawing code with an
> #ifdef CONFIG_FB_LOGO
>
> Tony
>
> diff -Naur linux-2.5.61-fbdev/drivers/video/fbmem.c linux-2.5.61-ad/drivers/video/fbmem.c
> --- linux-2.5.61-fbdev/drivers/video/fbmem.c 2003-02-16 11:08:40.000000000 +0000
> +++ linux-2.5.61-ad/drivers/video/fbmem.c 2003-02-16 11:08:19.000000000 +0000
> @@ -41,7 +41,6 @@
> #include <asm/pgtable.h>
>
> #include <linux/fb.h>
> -#include <linux/linux_logo.h>
>
> #ifdef CONFIG_FRAMEBUFFER_CONSOLE
> #include "console/fbcon.h"
> @@ -369,6 +368,9 @@
> return n < 0 ? d >> -n : d << n;
> }
>
> +#ifdef CONFIG_FB_LOGO
> +#include <linux/linux_logo.h>
> +
> static void __init fb_set_logocmap(struct fb_info *info,
> const struct linux_logo *logo)
> {
> @@ -656,6 +658,10 @@
> kfree(logo_new);
> return fb_logo.logo->height;
> }
> +#else
> +int fb_prepare_logo(struct fb_info *info) { return 0; }
> +int fb_show_logo(struct fb_info *info) { return 0; }
> +#endif /* CONFIG_FB_LOGO */
>
> static int fbmem_read_proc(char *buf, char **start, off_t offset,
> int len, int *eof, void *private)
>
>
|
|
From: Geert U. <ge...@li...> - 2003-02-17 22:06:41
|
On 16 Feb 2003, Antonino Daplas wrote:
> On Sun, 2003-02-16 at 14:08, Antonino Daplas wrote:
> > The attached patch (linux-2.5.61 + James' fbdev.diff) fixes the following:
> >
> > 1. compile error because of missing scripts/pmntologo.
> >
> > 2. Break up of fb_show_logo() to fb_prepare_logo()/fb_show_logo() to fix
> > weird "double drawing" or the "single draw, erase in a flash" of the
> > logo.
> >
> > 3. Fixed all drivers affected by the (image.depth == 0) is color
> > expansion.
> >
>
> Here's an incremental diff to protect logo drawing code with an
> #ifdef CONFIG_FB_LOGO
Note that it's called CONFIG_LOGO now.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@li...
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
|
|
From: James S. <jsi...@in...> - 2003-02-16 16:40:43
|
Applied. > The attached patch (linux-2.5.61 + James' fbdev.diff) fixes the following: > > 1. compile error because of missing scripts/pmntologo. Hm. I thought there was only a c file that generated a binary to. That shouldn't be missing. It might be a BK sync issue on my part. > 2. Break up of fb_show_logo() to fb_prepare_logo()/fb_show_logo() to fix > weird "double drawing" or the "single draw, erase in a flash" of the > logo. > > 3. Fixed all drivers affected by the (image.depth == 0) is color > expansion. |
|
From: Antonino D. <ad...@po...> - 2003-02-17 11:33:53
|
On Sun, 2003-02-16 at 14:08, Antonino Daplas wrote: > 3. Fixed all drivers affected by the (image.depth == 0) is color > expansion. > Sigh, missed fbcon_putc(). Tony diff -Naur linux-2.5.61-fbdev/drivers/video/console/fbcon.c linux-2.5.61/drivers/video/console/fbcon.c --- linux-2.5.61-fbdev/drivers/video/console/fbcon.c 2003-02-17 10:48:33.000000000 +0000 +++ linux-2.5.61/drivers/video/console/fbcon.c 2003-02-17 10:49:13.000000000 +0000 @@ -1157,7 +1157,7 @@ image.dy = real_y(p, ypos) * vc->vc_font.height; image.width = vc->vc_font.width; image.height = vc->vc_font.height; - image.depth = 1; + image.depth = 0; image.data = p->fontdata + (c & charmask) * vc->vc_font.height * width; info->fbops->fb_imageblit(info, &image); |
Thanks for helping keep SourceForge clean.
X