diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-04-10 22:55:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:18:54 -0700 |
| commit | 397eeab321e87d8c1ef928b58f256513e6f481dc (patch) | |
| tree | 01bdc74a00ef159b2be1eafd7c8b4010555d7a87 /drivers/video/fbmem.c | |
| parent | 89ec4c238e7a3d7e660291f3f1a8181381baad77 (diff) | |
| download | linux-397eeab321e87d8c1ef928b58f256513e6f481dc.tar.gz | |
[PATCH] fbdev: Use logo with depth of 4 or less for static pseudocolor
Since the visual STATIC_PSEUDOCOLOR has a read-only colormap, use logos with 16 colors only since these logos use the console palette. This has a higher likelihood that the logo will display correctly. Signed-of-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 944855b3e4af..8d8eadb64853 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -435,6 +435,11 @@ int fb_prepare_logo(struct fb_info *info, int rotate) depth = info->var.green.length; } + if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) { + /* assume console colormap */ + depth = 4; + } + if (depth >= 8) { switch (info->fix.visual) { case FB_VISUAL_TRUECOLOR: |