- fix vserver patch for 3.14.5

[packages/kernel.git] / kernel-fbcon-margins.patch

This fixes "margin colour" (colour used to clear margins - e.g. a half of line
at the bottom of 100x37 console on 800x600 framebuffer).

I don't know what was the intention behind using attr_bgcol_ec() here, but it
caused using of background colour of last erase character to clear margins -
which definitely isn't what we want...
This patch changes margin colour to black (or colour 0 in palette modes).

	-- Jakub Bogusz <qboosh@pld-linux.org>

--- linux-2.6.9/drivers/video/console/bitblit.c.orig	2004-10-20 18:13:32.000000000 +0200
+++ linux-2.6.9/drivers/video/console/bitblit.c	2004-10-20 18:22:35.153056112 +0200
@@ -206,7 +206,6 @@
 static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,
 			      int bottom_only)
 {
-	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
 	unsigned int cw = vc->vc_font.width;
 	unsigned int ch = vc->vc_font.height;
 	unsigned int rw = info->var.xres - (vc->vc_cols*cw);
@@ -215,7 +214,7 @@
 	unsigned int bs = info->var.yres - bh;
 	struct fb_fillrect region;
 
-	region.color = attr_bgcol_ec(bgshift, vc, info);
+	region.color = 0;
 	region.rop = ROP_COPY;
 
 	if (rw && !bottom_only) {