From: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon, 26 Jun 2006 07:26:36 +0000 (-0700)
Subject: [PATCH] fbdev: Static pseudocolor with depth less than 4 does exist
X-Git-Tag: v2.6.18-rc1~711
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c683dbfc017e52e632853b33981be1a49276ba6;p=linux-2.6

[PATCH] fbdev: Static pseudocolor with depth less than 4 does exist

A static pseudocolor visual with depth less than 4 does exist, so let's not
accidentally upscale the depth with this configuration

Signed-off-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 9bb6763d0c..2529805ed1 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -433,7 +433,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
 			depth = info->var.green.length;
 	}
 
-	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR) {
+	if (info->fix.visual == FB_VISUAL_STATIC_PSEUDOCOLOR && depth > 4) {
 		/* assume console colormap */
 		depth = 4;
 	}