SOURCES: kernel-desktop-fbcon-margins.patch (NEW), kernel-desktop-...

sparky sparky at pld-linux.org
Mon Jun 19 13:43:56 CEST 2006


Author: sparky                       Date: Mon Jun 19 11:43:56 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from LINUX_2_6

---- Files affected:
SOURCES:
   kernel-desktop-fbcon-margins.patch (NONE -> 1.1)  (NEW), kernel-desktop-static-dev.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-fbcon-margins.patch
diff -u /dev/null SOURCES/kernel-desktop-fbcon-margins.patch:1.1
--- /dev/null	Mon Jun 19 13:43:56 2006
+++ SOURCES/kernel-desktop-fbcon-margins.patch	Mon Jun 19 13:43:51 2006
@@ -0,0 +1,29 @@
+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 at 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);
++	region.color = 0;
+ 	region.rop = ROP_COPY;
+ 
+ 	if (rw && !bottom_only) {

================================================================
Index: SOURCES/kernel-desktop-static-dev.patch
diff -u /dev/null SOURCES/kernel-desktop-static-dev.patch:1.1
--- /dev/null	Mon Jun 19 13:43:56 2006
+++ SOURCES/kernel-desktop-static-dev.patch	Mon Jun 19 13:43:51 2006
@@ -0,0 +1,22 @@
+--- a/drivers/char/misc.c.orig	2004-12-24 22:35:28.000000000 +0100
++++ b/drivers/char/misc.c	2005-01-05 11:16:47.000000000 +0100
+@@ -220,7 +220,7 @@
+ 	}
+ 
+ 	if (misc->minor == MISC_DYNAMIC_MINOR) {
+-		int i = DYNAMIC_MINORS;
++		int i = DYNAMIC_MINORS - 3 /* reserved */;
+ 		while (--i >= 0)
+ 			if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
+ 				break;
+--- a/drivers/md/dm-ioctl.c.orig	2004-12-24 22:34:29.000000000 +0100
++++ b/drivers/md/dm-ioctl.c	2005-01-05 11:11:39.000000000 +0100
+@@ -1374,7 +1374,7 @@
+ };
+ 
+ static struct miscdevice _dm_misc = {
+-	.minor 		= MISC_DYNAMIC_MINOR,
++	.minor 		= 63 /* MISC_DYNAMIC_MINOR */,
+ 	.name  		= DM_NAME,
+ 	.devfs_name 	= "mapper/control",
+ 	.fops  		= &_ctl_fops
================================================================


More information about the pld-cvs-commit mailing list