[PATCH][FBDEV]: Find correct logo for directcolor < 24bpp

[PATCH][FBDEV]: Find correct logo for directcolor < 24bpp

[Antonino A. Daplas]

Hi Andrew,

Current algorithm does not choose correct logo type for directcolor < 24 bpp.
It chooses logo_224, but this is too deep for bpp < 24.  This should fix the
problem.

Tony

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

 fbmem.c |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff -uprN linux-2.6.8-rc2-mm2-orig/drivers/video/fbmem.c linux-2.6.8-rc2-mm2/drivers/video/fbmem.c
--- linux-2.6.8-rc2-mm2-orig/drivers/video/fbmem.c	2004-08-04 23:37:26.339174664 +0000
+++ linux-2.6.8-rc2-mm2/drivers/video/fbmem.c	2004-08-04 23:37:40.785978416 +0000
@@ -734,26 +734,35 @@ static struct logo_data {
 
 int fb_prepare_logo(struct fb_info *info)
 {
+	int depth = fb_get_color_depth(info);
+
 	memset(&fb_logo, 0, sizeof(struct logo_data));
 
-	switch (info->fix.visual) {
-	case FB_VISUAL_TRUECOLOR:
-		if (info->var.bits_per_pixel >= 8)
+	if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+		depth = info->var.blue.length;
+		if (info->var.red.length < depth)
+			depth = info->var.red.length;
+		if (info->var.green.length < depth)
+			depth = info->var.green.length;
+	}
+
+	if (depth >= 8) {
+		switch (info->fix.visual) {
+		case FB_VISUAL_TRUECOLOR:
 			fb_logo.needs_truepalette = 1;
-		break;
-	case FB_VISUAL_DIRECTCOLOR:
-		if (info->var.bits_per_pixel >= 24) {
+			break;
+		case FB_VISUAL_DIRECTCOLOR:
 			fb_logo.needs_directpalette = 1;
 			fb_logo.needs_cmapreset = 1;
+			break;
+		case FB_VISUAL_PSEUDOCOLOR:
+			fb_logo.needs_cmapreset = 1;
+			break;
 		}
-		break;
-	case FB_VISUAL_PSEUDOCOLOR:
-		fb_logo.needs_cmapreset = 1;
-		break;
 	}
 
 	/* Return if no suitable logo was found */
-	fb_logo.logo = fb_find_logo(fb_get_color_depth(info));
+	fb_logo.logo = fb_find_logo(depth);
 	
 	if (!fb_logo.logo || fb_logo.logo->height > info->var.yres) {
 		fb_logo.logo = NULL;




-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com