From: Antonino A. Daplas <adaplas@gmail.com>
Date: Tue, 11 Apr 2006 05:55:49 +0000 (-0700)
Subject: [PATCH] fbdev: Use logo with depth of 4 or less for static pseudocolor
X-Git-Tag: v2.6.17-rc2~109
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397eeab321e87d8c1ef928b58f256513e6f481dc;p=linux-2.6

[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>
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 944855b3e4..8d8eadb648 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: