/[pkg-src]/trunk/kernel26-alx/patches-2.6.26_rc7-r1/0150-2.6.26_rc7-fbcondecor-0.9.4.patch

Diff of /trunk/kernel26-alx/patches-2.6.26_rc7-r1/0150-2.6.26_rc7-fbcondecor-0.9.4.patch

Parent Directory | Revision Log | View Patch Patch

-revision 656 by niro,
Mon Jun 23 11:14:24 2008 UTC
+revision 657 by niro,
Mon Jun 23 14:13:54 2008 UTC
 Line 1
- diff -Naurp linux-orig/Documentation/fb/00-INDEX linux-fbcondecor/Documentation/fb/00-INDEX
+ diff -Naurp -x .git /tmp/linux/Documentation/fb/00-INDEX ./Documentation/fb/00-INDEX
- --- linux-orig/Documentation/fb/00-INDEX	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/Documentation/fb/00-INDEX	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/Documentation/fb/00-INDEX	2008-01-24 10:08:34.000000000 +0100
+ +++ ./Documentation/fb/00-INDEX	2008-03-25 23:04:10.000000000 +0100
  @@ -17,6 +17,8 @@ deferred_io.txt
   	- an introduction to deferred IO.
   fbcon.txt
 Line 10 
 diff -Naurp linux-orig/Documentation/fb/
   framebuffer.txt
   	- introduction to frame buffer devices.
   imacfb.txt
- diff -Naurp linux-orig/Documentation/fb/fbcondecor.txt linux-fbcondecor/Documentation/fb/fbcondecor.txt
+ diff -Naurp -x .git /tmp/linux/Documentation/fb/fbcondecor.txt ./Documentation/fb/fbcondecor.txt
- --- linux-orig/Documentation/fb/fbcondecor.txt	1970-01-01 01:00:00.000000000 +0100
+ --- /tmp/linux/Documentation/fb/fbcondecor.txt	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/Documentation/fb/fbcondecor.txt	2008-01-24 10:08:34.000000000 +0100
+ +++ ./Documentation/fb/fbcondecor.txt	2008-03-25 23:04:10.000000000 +0100
  @@ -0,0 +1,207 @@
  +What is it?
  +-----------
 Line 221 
 diff -Naurp linux-orig/Documentation/fb/
  +Fbcondecor, fbcondecor protocol design, current implementation & docs by:
  +  Michal Januszewski <spock@gentoo.org>
  +
- diff -Naurp linux-orig/drivers/Makefile linux-fbcondecor/drivers/Makefile
+ diff -Naurp -x .git /tmp/linux/drivers/Makefile ./drivers/Makefile
- --- linux-orig/drivers/Makefile	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/Makefile	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/Makefile	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/Makefile	2008-03-25 23:04:10.000000000 +0100
- @@ -8,6 +8,9 @@
+ @@ -9,6 +9,9 @@ obj-$(CONFIG_HAVE_GPIO_LIB)	+= gpio/
   obj-$(CONFIG_PCI)		+= pci/
   obj-$(CONFIG_PARISC)		+= parisc/
   obj-$(CONFIG_RAPIDIO)		+= rapidio/
 Line 234 
 diff -Naurp linux-orig/drivers/Makefile
   obj-y				+= video/
   obj-$(CONFIG_ACPI)		+= acpi/
   # PnP must come after ACPI since it will eventually need to check if acpi
- @@ -17,10 +20,6 @@ obj-$(CONFIG_ARM_AMBA)		+= amba/
+ @@ -18,10 +21,6 @@ obj-$(CONFIG_ARM_AMBA)		+= amba/
   obj-$(CONFIG_XEN)		+= xen/
 Line 245 
 diff -Naurp linux-orig/drivers/Makefile
   obj-$(CONFIG_CONNECTOR)		+= connector/
   # i810fb and intelfb depend on char/agp/
- diff -Naurp linux-orig/drivers/video/console/bitblit.c linux-fbcondecor/drivers/video/console/bitblit.c
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/bitblit.c ./drivers/video/console/bitblit.c
- --- linux-orig/drivers/video/console/bitblit.c	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/console/bitblit.c	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/bitblit.c	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/bitblit.c	2008-03-25 23:04:10.000000000 +0100
  @@ -17,6 +17,7 @@
   #include <linux/console.h>
   #include <asm/types.h>
 Line 290 
 diff -Naurp linux-orig/drivers/video/con
   	ops->cursor_reset = 0;
   }
- diff -Naurp linux-orig/drivers/video/console/cfbcondecor.c linux-fbcondecor/drivers/video/console/cfbcondecor.c
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/cfbcondecor.c ./drivers/video/console/cfbcondecor.c
- --- linux-orig/drivers/video/console/cfbcondecor.c	1970-01-01 01:00:00.000000000 +0100
+ --- /tmp/linux/drivers/video/console/cfbcondecor.c	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/cfbcondecor.c	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/cfbcondecor.c	2008-03-25 23:11:30.000000000 +0100
  @@ -0,0 +1,471 @@
  +/*
  + *  linux/drivers/video/cfbcon_decor.c -- Framebuffer decor render functions
  + *
  + *  Copyright (C) 2004 Michal Januszewski <spock@gentoo.org>
  + *
  + *  Code based upon "Bootdecor" (C) 2001-2003
  + *       Volker Poplawski <volker@poplawski.de>,
  + *       Stefan Reinauer <stepan@suse.de>,
  + *       Steffen Winterfeldt <snwint@suse.de>,
 Line 309 
 diff -Naurp linux-orig/drivers/video/con
  + *  This file is subject to the terms and conditions of the GNU General Public
  + *  License.  See the file COPYING in the main directory of this archive for
  + *  more details.
  + */
  +#include <linux/module.h>
  +#include <linux/types.h>
  +#include <linux/fb.h>
 Line 336 
 diff -Naurp linux-orig/drivers/video/con
  +void fbcon_decor_fix_pseudo_pal(struct fb_info *info, struct vc_data *vc)
  +{
  +	int i, j, k;
  +	int minlen = min(min(info->var.red.length, info->var.green.length),
  +			     info->var.blue.length);
  +	u32 col;
  +
  +	for (j = i = 0; i < 16; i++) {
  +		k = color_table[i];
  +
  +		col = ((vc->vc_palette[j++]  >> (8-minlen))
  +			<< info->var.red.offset);
  +		col |= ((vc->vc_palette[j++] >> (8-minlen))
  +			<< info->var.green.offset);
  +		col |= ((vc->vc_palette[j++] >> (8-minlen))
  +			<< info->var.blue.offset);
  +			((u32 *)info->pseudo_palette)[k] = col;
  +	}
  +}
  +
  +void fbcon_decor_renderc(struct fb_info *info, int ypos, int xpos, int height,
  +		      int width, u8* src, u32 fgx, u32 bgx, u8 transparent)
  +{
  +	unsigned int x, y;
  +	u32 dd;
  +	int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
 Line 368 
 diff -Naurp linux-orig/drivers/video/con
  +
  +	if ((ypos + height) > info->var.yres || (xpos + width) > info->var.xres)
  +		return;
  +
  +	for (y = 0; y < height; y++) {
  +		switch (info->var.bits_per_pixel) {
  +
  +		case 32:
  +			for (x = 0; x < width; x++) {
  +
 Line 380 
 diff -Naurp linux-orig/drivers/video/con
  +				if (d & 0x80)
  +					dd = fgx;
  +				else
  +					dd = transparent ?
  +					     *(u32 *)decor_src : bgx;
  +
  +				d <<= 1;
  +				decor_src += 4;
  +				fb_writel(dd, dst);
 Line 397 
 diff -Naurp linux-orig/drivers/video/con
  +				if (d & 0x80)
  +					dd = fgx;
  +				else
  +					dd = transparent ?
  +					     (*(u32 *)decor_src & 0xffffff) : bgx;
  +
  +				d <<= 1;
  +				decor_src += 3;
  +#ifdef __LITTLE_ENDIAN
 Line 416 
 diff -Naurp linux-orig/drivers/video/con
  +			break;
  +		case 16:
  +			for (x = 0; x < width; x += 2) {
- +		    		if ((x & 7) == 0)
+ +				if ((x & 7) == 0)
  +					d = *src++;
  +
  +				parse_pixel(0, 2, u16);
 Line 436 
 diff -Naurp linux-orig/drivers/video/con
  +			for (x = 0; x < width; x += 4) {
  +				if ((x & 7) == 0)
  +					d = *src++;
  +
  +				parse_pixel(0, 1, u8);
  +				parse_pixel(1, 1, u8);
  +				parse_pixel(2, 1, u8);
  +				parse_pixel(3, 1, u8);
  +
  +#ifdef __LITTLE_ENDIAN
  +				dd = dd2[0] | (dd2[1] << 8) | (dd2[2] << 16) | (dd2[3] << 24);
  +#else
 Line 450 
 diff -Naurp linux-orig/drivers/video/con
  +				d <<= 4;
  +				fb_writel(dd, dst);
  +				dst += 4;
  +			}
  +		}
  +
  +		dst += info->fix.line_length - width * bytespp;
  +		decor_src += (info->var.xres - width) * bytespp;
- +    	}
+ +	}
  +}
  +
  +#define cc2cx(a) 						\
 Line 475 
 diff -Naurp linux-orig/drivers/video/con
  +
  +	fg_color = get_color(vc, info, c, 1);
  +        bg_color = get_color(vc, info, c, 0);
  +
  +	/* Don't paint the background image if console is blanked */
  +	transparent = ops->blank_state ? 0 :
  +		(vc->vc_decor.bg_color == bg_color);
  +
  +	xx = xx * vc->vc_font.width + vc->vc_decor.tx;
 Line 491 
 diff -Naurp linux-orig/drivers/video/con
  +		src = vc->vc_font.data + (c & charmask) * vc->vc_font.height *
  +		      ((vc->vc_font.width + 7) >> 3);
  +
  +		fbcon_decor_renderc(info, yy, xx, vc->vc_font.height,
  +			       vc->vc_font.width, src, fgx, bgx, transparent);
  +		xx += vc->vc_font.width;
  +	}
 Line 502 
 diff -Naurp linux-orig/drivers/video/con
  +	int i;
  +	unsigned int dsize, s_pitch;
  +	struct fbcon_ops *ops = info->fbcon_par;
  +	struct vc_data* vc;
  +	u8 *src;
  +
  +	/* we really don't need any cursors while the console is blanked */
 Line 517 
 diff -Naurp linux-orig/drivers/video/con
  +
  +	s_pitch = (cursor->image.width + 7) >> 3;
  +	dsize = s_pitch * cursor->image.height;
  +	if (cursor->enable) {
  +		switch (cursor->rop) {
  +		case ROP_XOR:
  +			for (i = 0; i < dsize; i++)
 Line 545 
 diff -Naurp linux-orig/drivers/video/con
  +	kfree(src);
  +}
  +
  +static void decorset(u8 *dst, int height, int width, int dstbytes,
  +		        u32 bgx, int bpp)
  +{
  +	int i;
  +
  +	if (bpp == 8)
  +		bgx |= bgx << 8;
  +	if (bpp == 16 || bpp == 8)
  +		bgx |= bgx << 16;
  +
  +	while (height-- > 0) {
  +		u8 *p = dst;
  +
  +		switch (bpp) {
  +
  +		case 32:
  +			for (i=0; i < width; i++) {
  +				fb_writel(bgx, p); p += 4;
  +			}
  +			break;
  +		case 24:
  +			for (i=0; i < width; i++) {
  +#ifdef __LITTLE_ENDIAN
  +				fb_writew((bgx & 0xffff),(u16*)p); p += 2;
 Line 590 
 diff -Naurp linux-orig/drivers/video/con
  +			for (i=0; i < width/4; i++) {
  +				fb_writel(bgx,p); p += 4;
  +			}
  +
  +			if (width & 2) {
  +				fb_writew(bgx,p); p += 2;
  +			}
 Line 598 
 diff -Naurp linux-orig/drivers/video/con
  +				fb_writeb(bgx,(u8*)p);
  +			break;
  +
  +		}
  +		dst += dstbytes;
  +	}
  +}
  +
  +void fbcon_decor_copy(u8 *dst, u8 *src, int height, int width, int linebytes,
  +		   int srclinebytes, int bpp)
  +{
  +	int i;
 Line 613 
 diff -Naurp linux-orig/drivers/video/con
  +		u32 *q = (u32 *)src;
  +
  +		switch (bpp) {
  +
  +		case 32:
  +			for (i=0; i < width; i++)
  +				fb_writel(*q++, p++);
  +			break;
  +		case 24:
  +			for (i=0; i < (width*3/4); i++)
  +				fb_writel(*q++, p++);
  +			if ((width*3) % 4) {
 Line 641 
 diff -Naurp linux-orig/drivers/video/con
  +				fb_writew(*(u16*)q, (u16*)p);
  +			break;
  +		case 8:
  +			for (i=0; i < width/4; i++)
  +				fb_writel(*q++, p++);
  +
  +			if (width & 2) {
  +				fb_writew(*(u16*)q, (u16*)p);
  +				q = (u32*) ((u16*)q + 1);
  +				p = (u32*) ((u16*)p + 1);
  +			}
 Line 659 
 diff -Naurp linux-orig/drivers/video/con
  +	}
  +}
  +
  +static void decorfill(struct fb_info *info, int sy, int sx, int height,
  +		       int width)
  +{
  +	int bytespp = ((info->var.bits_per_pixel + 7) >> 3);
  +	int d  = sy * info->fix.line_length + sx * bytespp;
 Line 671 
 diff -Naurp linux-orig/drivers/video/con
  +		    info->var.bits_per_pixel);
  +}
  +
  +void fbcon_decor_clear(struct vc_data *vc, struct fb_info *info, int sy, int sx,
  +		    int height, int width)
  +{
  +	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
- +	int bg_color = attr_bgcol_ec(bgshift, vc);
- +	int transparent = vc->vc_decor.bg_color == bg_color;
  +	struct fbcon_ops *ops = info->fbcon_par;
  +	u8 *dst;
+ +	int transparent, bg_color = attr_bgcol_ec(bgshift, vc, info);
  +
+ +	transparent = (vc->vc_decor.bg_color == bg_color);
  +	sy = sy * vc->vc_font.height + vc->vc_decor.ty;
  +	sx = sx * vc->vc_font.width + vc->vc_decor.tx;
  +	height *= vc->vc_font.height;
 Line 689 
 diff -Naurp linux-orig/drivers/video/con
  +	if (transparent && !ops->blank_state) {
  +		decorfill(info, sy, sx, height, width);
  +	} else {
  +		dst = (u8 *)(info->screen_base + sy * info->fix.line_length +
  +			     sx * ((info->var.bits_per_pixel + 7) >> 3));
  +		decorset(dst, height, width, info->fix.line_length, cc2cx(bg_color),
  +			  info->var.bits_per_pixel);
  +	}
  +}
  +
  +void fbcon_decor_clear_margins(struct vc_data *vc, struct fb_info *info,
  +			    int bottom_only)
  +{
  +	unsigned int tw = vc->vc_cols*vc->vc_font.width;
 Line 765 
 diff -Naurp linux-orig/drivers/video/con
  +	}
  +}
  +
- diff -Naurp linux-orig/drivers/video/console/fbcon.c linux-fbcondecor/drivers/video/console/fbcon.c
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/fbcon.c ./drivers/video/console/fbcon.c
- --- linux-orig/drivers/video/console/fbcon.c	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/console/fbcon.c	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/fbcon.c	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/fbcon.c	2008-03-25 23:04:10.000000000 +0100
  @@ -90,6 +90,7 @@
   #endif
 Line 794 
 diff -Naurp linux-orig/drivers/video/con
   	      u16 c, int is_fg)
   {
   	int depth = fb_get_color_depth(&info->var, &info->fix);
- @@ -423,6 +424,7 @@ static void fb_flashcursor(struct work_s
+ @@ -420,6 +421,7 @@ static void fb_flashcursor(struct work_s
   		CM_ERASE : CM_DRAW;
   	ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
   		    get_color(vc, info, c, 0));
 Line 802 
 diff -Naurp linux-orig/drivers/video/con
   	release_console_sem();
   }
- @@ -593,6 +595,8 @@ static int fbcon_takeover(int show_logo)
+ @@ -590,6 +592,8 @@ static int fbcon_takeover(int show_logo)
   		info_idx = -1;
   	}
 Line 811 
 diff -Naurp linux-orig/drivers/video/con
   	return err;
   }
- @@ -1034,6 +1038,12 @@ static const char *fbcon_startup(void)
+ @@ -1031,6 +1035,12 @@ static const char *fbcon_startup(void)
   	rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
   	cols /= vc->vc_font.width;
   	rows /= vc->vc_font.height;
 Line 824 
 diff -Naurp linux-orig/drivers/video/con
   	vc_resize(vc, cols, rows);
   	DPRINTK("mode:   %s\n", info->fix.id);
- @@ -1117,7 +1127,7 @@ static void fbcon_init(struct vc_data *v
+ @@ -1114,7 +1124,7 @@ static void fbcon_init(struct vc_data *v
   	cap = info->flags;
   	if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
 Line 833 
 diff -Naurp linux-orig/drivers/video/con
   		logo = 0;
   	if (var_to_display(p, &info->var, info))
- @@ -1316,6 +1326,11 @@ static void fbcon_clear(struct vc_data *
+ @@ -1313,6 +1323,11 @@ static void fbcon_clear(struct vc_data *
   	if (!height || !width)
   		return;
 Line 845 
 diff -Naurp linux-orig/drivers/video/con
   	/* Split blits that cross physical y_wrap boundary */
   	y_break = p->vrows - p->yscroll;
- @@ -1335,10 +1350,15 @@ static void fbcon_putcs(struct vc_data *
+ @@ -1332,10 +1347,15 @@ static void fbcon_putcs(struct vc_data *
   	struct display *p = &fb_display[vc->vc_num];
   	struct fbcon_ops *ops = info->fbcon_par;
 Line 865 
 diff -Naurp linux-orig/drivers/video/con
   }
   static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
- @@ -1354,8 +1374,13 @@ static void fbcon_clear_margins(struct v
+ @@ -1351,8 +1371,13 @@ static void fbcon_clear_margins(struct v
   	struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
   	struct fbcon_ops *ops = info->fbcon_par;
 Line 881 
 diff -Naurp linux-orig/drivers/video/con
   }
   static void fbcon_cursor(struct vc_data *vc, int mode)
- @@ -1875,7 +1900,7 @@ static int fbcon_scroll(struct vc_data *
+ @@ -1872,7 +1897,7 @@ static int fbcon_scroll(struct vc_data *
   			count = vc->vc_rows;
   		if (softback_top)
   			fbcon_softback_note(vc, t, count);
 Line 890 
 diff -Naurp linux-orig/drivers/video/con
   			goto redraw_up;
   		switch (p->scrollmode) {
   		case SCROLL_MOVE:
- @@ -1968,6 +1993,8 @@ static int fbcon_scroll(struct vc_data *
+ @@ -1965,6 +1990,8 @@ static int fbcon_scroll(struct vc_data *
   			count = vc->vc_rows;
   		if (logo_shown >= 0)
   			goto redraw_down;
 Line 899 
 diff -Naurp linux-orig/drivers/video/con
   		switch (p->scrollmode) {
   		case SCROLL_MOVE:
   			fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
- @@ -2116,6 +2143,13 @@ static void fbcon_bmove_rec(struct vc_da
+ @@ -2113,6 +2140,13 @@ static void fbcon_bmove_rec(struct vc_da
   		}
   		return;
   	}
 Line 913 
 diff -Naurp linux-orig/drivers/video/con
   	ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
   		   height, width);
   }
- @@ -2186,8 +2220,8 @@ static int fbcon_resize(struct vc_data *
+ @@ -2183,8 +2217,8 @@ static int fbcon_resize(struct vc_data *
   	var.yres = virt_h * virt_fh;
   	x_diff = info->var.xres - var.xres;
   	y_diff = info->var.yres - var.yres;
 Line 924 
 diff -Naurp linux-orig/drivers/video/con
   		const struct fb_videomode *mode;
   		DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
- @@ -2223,6 +2257,19 @@ static int fbcon_switch(struct vc_data *
+ @@ -2220,6 +2254,19 @@ static int fbcon_switch(struct vc_data *
   	info = registered_fb[con2fb_map[vc->vc_num]];
   	ops = info->fbcon_par;
 Line 944 
 diff -Naurp linux-orig/drivers/video/con
   	if (softback_top) {
   		if (softback_lines)
- @@ -2241,9 +2288,6 @@ static int fbcon_switch(struct vc_data *
+ @@ -2238,9 +2285,6 @@ static int fbcon_switch(struct vc_data *
   		logo_shown = FBCON_LOGO_CANSHOW;
   	}
 Line 954 
 diff -Naurp linux-orig/drivers/video/con
   	/*
   	 * FIXME: If we have multiple fbdev's loaded, we need to
   	 * update all info->currcon.  Perhaps, we can place this
- @@ -2283,6 +2327,18 @@ static int fbcon_switch(struct vc_data *
+ @@ -2280,6 +2324,18 @@ static int fbcon_switch(struct vc_data *
   			fbcon_del_cursor_timer(old_info);
   	}
 Line 973 
 diff -Naurp linux-orig/drivers/video/con
   	if (fbcon_is_inactive(vc, info) ||
   	    ops->blank_state != FB_BLANK_UNBLANK)
   		fbcon_del_cursor_timer(info);
- @@ -2397,8 +2453,12 @@ static int fbcon_blank(struct vc_data *v
+ @@ -2394,8 +2450,12 @@ static int fbcon_blank(struct vc_data *v
   			fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
   			ops->cursor_flash = (!blank);
 Line 988 
 diff -Naurp linux-orig/drivers/video/con
   		}
   		if (!blank)
- @@ -2549,13 +2609,22 @@ static int fbcon_do_set_font(struct vc_d
+ @@ -2546,13 +2606,22 @@ static int fbcon_do_set_font(struct vc_d
   	}
   	if (resize) {
 Line 1011 
 diff -Naurp linux-orig/drivers/video/con
   		if (CON_IS_VISIBLE(vc) && softback_buf)
   			fbcon_update_softback(vc);
   	} else if (CON_IS_VISIBLE(vc)
- @@ -2684,7 +2753,7 @@ static int fbcon_set_palette(struct vc_d
+ @@ -2681,7 +2750,7 @@ static int fbcon_set_palette(struct vc_d
   	int i, j, k, depth;
   	u8 val;
 Line 1020 
 diff -Naurp linux-orig/drivers/video/con
   		return -EINVAL;
   	if (!CON_IS_VISIBLE(vc))
- @@ -2710,7 +2779,49 @@ static int fbcon_set_palette(struct vc_d
+ @@ -2707,7 +2776,49 @@ static int fbcon_set_palette(struct vc_d
   	} else
   		fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
 Line 1071 
 diff -Naurp linux-orig/drivers/video/con
   }
   static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
- @@ -2936,7 +3047,14 @@ static void fbcon_modechanged(struct fb_
+ @@ -2933,7 +3044,14 @@ static void fbcon_modechanged(struct fb_
   		rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
   		cols /= vc->vc_font.width;
   		rows /= vc->vc_font.height;
 Line 1087 
 diff -Naurp linux-orig/drivers/video/con
   		updatescrollmode(p, info, vc);
   		scrollback_max = 0;
   		scrollback_current = 0;
- @@ -3564,6 +3682,7 @@ static void fbcon_exit(void)
+ @@ -3561,6 +3679,7 @@ static void fbcon_exit(void)
   		}
   	}
 Line 1095 
 diff -Naurp linux-orig/drivers/video/con
   	fbcon_has_exited = 1;
   }
- diff -Naurp linux-orig/drivers/video/console/fbcondecor.c linux-fbcondecor/drivers/video/console/fbcondecor.c
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/fbcondecor.c ./drivers/video/console/fbcondecor.c
- --- linux-orig/drivers/video/console/fbcondecor.c	1970-01-01 01:00:00.000000000 +0100
+ --- /tmp/linux/drivers/video/console/fbcondecor.c	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/fbcondecor.c	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/fbcondecor.c	2008-03-25 23:04:10.000000000 +0100
  @@ -0,0 +1,420 @@
  +/*
  + *  linux/drivers/video/console/fbcondecor.c -- Framebuffer console decorations
 Line 1519 
 diff -Naurp linux-orig/drivers/video/con
  +}
  +
  +EXPORT_SYMBOL(fbcon_decor_path);
- diff -Naurp linux-orig/drivers/video/console/fbcondecor.h linux-fbcondecor/drivers/video/console/fbcondecor.h
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/fbcondecor.h ./drivers/video/console/fbcondecor.h
- --- linux-orig/drivers/video/console/fbcondecor.h	1970-01-01 01:00:00.000000000 +0100
+ --- /tmp/linux/drivers/video/console/fbcondecor.h	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/fbcondecor.h	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/fbcondecor.h	2008-03-25 23:04:10.000000000 +0100
  @@ -0,0 +1,78 @@
  +/*
  + *  linux/drivers/video/console/fbcondecor.h -- Framebuffer Console Decoration headers
 Line 1601 
 diff -Naurp linux-orig/drivers/video/con
  +#endif /* CONFIG_FB_CON_DECOR */
  +
  +#endif /* __FBCON_DECOR_H */
- diff -Naurp linux-orig/drivers/video/console/Kconfig linux-fbcondecor/drivers/video/console/Kconfig
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/Kconfig ./drivers/video/console/Kconfig
- --- linux-orig/drivers/video/console/Kconfig	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/console/Kconfig	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/Kconfig	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/Kconfig	2008-03-25 23:04:10.000000000 +0100
  @@ -144,6 +144,19 @@ config FRAMEBUFFER_CONSOLE_ROTATION
            such that other users of the framebuffer will remain normally
            oriented.
 Line 1624 
 diff -Naurp linux-orig/drivers/video/con
   config STI_CONSOLE
           bool "STI text console"
           depends on PARISC
- diff -Naurp linux-orig/drivers/video/console/Makefile linux-fbcondecor/drivers/video/console/Makefile
+ diff -Naurp -x .git /tmp/linux/drivers/video/console/Makefile ./drivers/video/console/Makefile
- --- linux-orig/drivers/video/console/Makefile	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/console/Makefile	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/console/Makefile	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/console/Makefile	2008-03-25 23:04:10.000000000 +0100
  @@ -35,6 +35,7 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     +=
                                            fbcon_ccw.o
   endif
 Line 1635 
 diff -Naurp linux-orig/drivers/video/con
   obj-$(CONFIG_FB_STI)              += sticore.o font.o
   ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
- diff -Naurp linux-orig/drivers/video/fbcmap.c linux-fbcondecor/drivers/video/fbcmap.c
+ diff -Naurp -x .git /tmp/linux/drivers/video/fbcmap.c ./drivers/video/fbcmap.c
- --- linux-orig/drivers/video/fbcmap.c	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/fbcmap.c	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/fbcmap.c	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/fbcmap.c	2008-03-25 23:04:10.000000000 +0100
  @@ -17,6 +17,8 @@
   #include <linux/slab.h>
   #include <linux/uaccess.h>
 Line 1677 
 diff -Naurp linux-orig/drivers/video/fbc
   	if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
   			        !info->fbops->fb_setcmap))
   		return -EINVAL;
- diff -Naurp linux-orig/drivers/video/Kconfig linux-fbcondecor/drivers/video/Kconfig
+ diff -Naurp -x .git /tmp/linux/drivers/video/Kconfig ./drivers/video/Kconfig
- --- linux-orig/drivers/video/Kconfig	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/drivers/video/Kconfig	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/drivers/video/Kconfig	2008-01-24 10:08:34.000000000 +0100
+ +++ ./drivers/video/Kconfig	2008-03-25 23:04:10.000000000 +0100
- @@ -1121,7 +1121,6 @@ config FB_MATROX
+ @@ -1134,7 +1134,6 @@ config FB_MATROX
   	select FB_CFB_FILLRECT
   	select FB_CFB_COPYAREA
   	select FB_CFB_IMAGEBLIT
 Line 1688 
 diff -Naurp linux-orig/drivers/video/Kco
   	select FB_MACMODES if PPC_PMAC
   	---help---
   	  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
- diff -Naurp linux-orig/include/linux/console_decor.h linux-fbcondecor/include/linux/console_decor.h
+ diff -Naurp -x .git /tmp/linux/include/linux/console_decor.h ./include/linux/console_decor.h
- --- linux-orig/include/linux/console_decor.h	1970-01-01 01:00:00.000000000 +0100
+ --- /tmp/linux/include/linux/console_decor.h	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/include/linux/console_decor.h	2008-01-24 10:08:34.000000000 +0100
+ +++ ./include/linux/console_decor.h	2008-03-25 23:04:10.000000000 +0100
  @@ -0,0 +1,13 @@
  +#ifndef _LINUX_CONSOLE_DECOR_H_
  +#define _LINUX_CONSOLE_DECOR_H_ 1
 Line 1705 
 diff -Naurp linux-orig/include/linux/con
  +};
  +
  +#endif
- diff -Naurp linux-orig/include/linux/console_struct.h linux-fbcondecor/include/linux/console_struct.h
+ diff -Naurp -x .git /tmp/linux/include/linux/console_struct.h ./include/linux/console_struct.h
- --- linux-orig/include/linux/console_struct.h	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/include/linux/console_struct.h	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/include/linux/console_struct.h	2008-01-24 10:08:34.000000000 +0100
+ +++ ./include/linux/console_struct.h	2008-03-25 23:04:10.000000000 +0100
  @@ -19,6 +19,7 @@
   struct vt_struct;
 Line 1725 
 diff -Naurp linux-orig/include/linux/con
   	/* additional information is in vt_kern.h */
   };
- diff -Naurp linux-orig/include/linux/fb.h linux-fbcondecor/include/linux/fb.h
+ diff -Naurp -x .git /tmp/linux/include/linux/fb.h ./include/linux/fb.h
- --- linux-orig/include/linux/fb.h	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/include/linux/fb.h	2008-03-25 07:24:16.000000000 +0100
- +++ linux-fbcondecor/include/linux/fb.h	2008-01-24 10:08:34.000000000 +0100
+ +++ ./include/linux/fb.h	2008-03-25 23:04:10.000000000 +0100
  @@ -11,6 +11,13 @@ struct dentry;
   #define FB_MAJOR		29
   #define FB_MAX			32	/* sufficient for now */
 Line 1769 
 diff -Naurp linux-orig/include/linux/fb.
   	/* From here on everything is device dependent */
   	void *par;
   };
- diff -Naurp linux-orig/kernel/sysctl.c linux-fbcondecor/kernel/sysctl.c
+ diff -Naurp -x .git /tmp/linux/include/linux/fb.h.rej ./include/linux/fb.h.rej
- --- linux-orig/kernel/sysctl.c	2008-01-12 12:16:05.000000000 +0100
+ --- /tmp/linux/include/linux/fb.h.rej	1970-01-01 01:00:00.000000000 +0100
- +++ linux-fbcondecor/kernel/sysctl.c	2008-01-24 10:10:35.000000000 +0100
+ +++ ./include/linux/fb.h.rej	2006-08-21 02:51:22.000000000 +0200
- @@ -105,6 +105,9 @@ static int ngroups_max = NGROUPS_MAX;
+ @@ -0,0 +1,32 @@
+ +***************
+ +*** 1,7 ****
+ +  #ifndef _LINUX_FB_H
+ +  #define _LINUX_FB_H
+ +
+ +- #include <linux/backlight.h>
+ +  #include <asm/types.h>
+ +
+ +  /* Definitions of frame buffers						*/
+ +--- 1,6 ----
+ +  #ifndef _LINUX_FB_H
+ +  #define _LINUX_FB_H
+ +
+ +  #include <asm/types.h>
+ +
+ +  /* Definitions of frame buffers						*/
+ +***************
+ +*** 381,386 ****
+ +  #include <linux/workqueue.h>
+ +  #include <linux/notifier.h>
+ +  #include <linux/list.h>
+ +  #include <asm/io.h>
+ +
+ +  struct vm_area_struct;
+ +--- 380,386 ----
+ +  #include <linux/workqueue.h>
+ +  #include <linux/notifier.h>
+ +  #include <linux/list.h>
+ ++ #include <linux/backlight.h>
+ +  #include <asm/io.h>
+ +
+ +  struct vm_area_struct;
+ diff -Naurp -x .git /tmp/linux/kernel/sysctl.c ./kernel/sysctl.c
+ --- /tmp/linux/kernel/sysctl.c	2008-03-25 07:24:16.000000000 +0100
+ +++ ./kernel/sysctl.c	2008-03-25 23:04:10.000000000 +0100
+ @@ -107,6 +107,9 @@ static int ngroups_max = NGROUPS_MAX;
   #ifdef CONFIG_KMOD
   extern char modprobe_path[];
   #endif
-Line 1782 
 diff -Naurp linux-orig/kernel/sysctl.c l
+Line 1818 
 diff -Naurp linux-orig/kernel/sysctl.c l
   #ifdef CONFIG_CHR_DEV_SG
   extern int sg_big_buff;
   #endif
- @@ -775,6 +778,18 @@ static struct ctl_table kern_table[] = {
+ @@ -820,6 +823,18 @@ static struct ctl_table kern_table[] = {
   		.proc_handler	= &proc_dostring,
   		.strategy	= &sysctl_string,
   	},

 Legend:



Removed from v.656
 


changed lines


 
Added in v.657
 Legend:



Removed from v.656
 


changed lines


 
Added in v.657
-Removed from v.656
+Added in v.657