[patch] fbsplash-blanking-fix.patch

fbsplash-blanking-fix.patch (text/plain), 1.58 KB, created by Peter Beutner on 2005-04-01 08:15:57 UTC

--- linux-2.6.12-rc1-mm4-swsp2/drivers/video/cfbsplash.c.old	2005-03-31 20:45:02.000000000 +0200
+++ linux-2.6.12-rc1-mm4-swsp2/drivers/video/cfbsplash.c	2005-04-01 12:43:24.000000000 +0200
@@ -173,6 +173,7 @@ void fbsplash_putcs(struct vc_data *vc, 
 {
 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
 	int fg_color, bg_color, transparent;
+	struct fbcon_ops *ops = info->fbcon_par;
 
 	u8 *src;
 	u32 bgx, fgx;
@@ -181,8 +182,10 @@ void fbsplash_putcs(struct vc_data *vc, 
 
 	fg_color = get_color(vc, info, c, 1);
         bg_color = get_color(vc, info, c, 0);
-	transparent = vc->vc_splash.bg_color == bg_color;
-
+	/* if console is blanked, dont paint splash image*/
+	transparent = ops->blank_state ? 0 : 
+		(vc->vc_splash.bg_color == bg_color);
+	
 	xx = xx * vc->vc_font.width + vc->vc_splash.tx;
 	yy = yy * vc->vc_font.height + vc->vc_splash.ty;
 
@@ -379,7 +382,8 @@ void fbsplash_clear(struct vc_data *vc, 
 {
 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
 	int bg_color = attr_bgcol_ec(bgshift, vc);
-	int transparent = vc->vc_splash.bg_color == bg_color;
+	struct fbcon_ops *ops = info->fbcon_par;
+	int transparent = vc->vc_splash.bg_color == bg_color; 
 	u8 *dst;
 
 	sy = sy * vc->vc_font.height + vc->vc_splash.ty;
@@ -387,7 +391,8 @@ void fbsplash_clear(struct vc_data *vc, 
 	height *= vc->vc_font.height;
 	width *= vc->vc_font.width;
 
-	if (transparent) {
+	/* if console is blanked, dont paint splash image*/
+	if (transparent && !ops->blank_state) {
 		splashfill(info, sy, sx, height, width);
 	} else {
 		dst = (u8 *)(info->screen_base + sy * info->fix.line_length +