Author: shadzik Date: Mon Mar 16 15:44:00 2009 GMT Module: SOURCES Tag: Titanium ---- Log message: - new
---- Files affected: SOURCES: kernel-desktop-bootsplash.patch (1.3 -> 1.3.2.1) ---- Diffs: ================================================================ Index: SOURCES/kernel-desktop-bootsplash.patch diff -u SOURCES/kernel-desktop-bootsplash.patch:1.3 SOURCES/kernel-desktop-bootsplash.patch:1.3.2.1 --- SOURCES/kernel-desktop-bootsplash.patch:1.3 Tue Aug 28 19:45:08 2007 +++ SOURCES/kernel-desktop-bootsplash.patch Mon Mar 16 16:43:54 2009 @@ -1,8 +1,8 @@ -diff -urN linux-2.6.21-orig/drivers/char/keyboard.c linux-2.6.21/drivers/char/keyboard.c ---- linux-2.6.21-orig/drivers/char/keyboard.c 2007-04-26 10:58:50.000000000 +0300 -+++ linux-2.6.21/drivers/char/keyboard.c 2007-04-26 11:29:26.000000000 +0300 -@@ -1164,6 +1164,15 @@ - if (keycode < BTN_MISC) +diff -Nur linux-2.6.27.orig/drivers/char/keyboard.c linux-2.6.27/drivers/char/keyboard.c +--- linux-2.6.27.orig/drivers/char/keyboard.c 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/char/keyboard.c 2009-03-10 03:32:23.487449249 +0100 +@@ -1180,6 +1180,15 @@ + if (keycode < BTN_MISC && printk_ratelimit()) printk(KERN_WARNING "keyboard.c: can't emulate rawmode for keycode %d\n", keycode); +#ifdef CONFIG_BOOTSPLASH @@ -17,12 +17,12 @@ #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */ if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) { if (!sysrq_down) { -diff -urN linux-2.6.21-orig/drivers/char/n_tty.c linux-2.6.21/drivers/char/n_tty.c ---- linux-2.6.21-orig/drivers/char/n_tty.c 2007-04-26 10:58:50.000000000 +0300 -+++ linux-2.6.21/drivers/char/n_tty.c 2007-04-26 11:29:26.000000000 +0300 -@@ -1296,6 +1296,15 @@ +diff -Nur linux-2.6.27.orig/drivers/char/n_tty.c linux-2.6.27/drivers/char/n_tty.c +--- linux-2.6.27.orig/drivers/char/n_tty.c 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/char/n_tty.c 2009-03-10 03:32:23.487449249 +0100 +@@ -1325,6 +1325,15 @@ tty->minimum_to_wake = (minimum - (b - buf)); - + if (!input_available_p(tty, 0)) { +#ifdef CONFIG_BOOTSPLASH + if (file->f_dentry->d_inode->i_rdev == MKDEV(TTY_MAJOR,0) || @@ -36,10 +36,10 @@ if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) { retval = -EIO; break; -diff -urN linux-2.6.21-orig/drivers/char/vt.c linux-2.6.21/drivers/char/vt.c ---- linux-2.6.21-orig/drivers/char/vt.c 2007-04-26 10:58:50.000000000 +0300 -+++ linux-2.6.21/drivers/char/vt.c 2007-04-26 11:29:26.000000000 +0300 -@@ -3815,6 +3815,31 @@ +diff -Nur linux-2.6.27.orig/drivers/char/vt.c linux-2.6.27/drivers/char/vt.c +--- linux-2.6.27.orig/drivers/char/vt.c 2009-03-10 03:29:50.984141097 +0100 ++++ linux-2.6.27/drivers/char/vt.c 2009-03-10 03:32:23.490797270 +0100 +@@ -4092,6 +4092,31 @@ } } @@ -71,9 +71,9 @@ /* * Visible symbols for modules */ -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.c linux-2.6.21/drivers/video/bootsplash/bootsplash.c ---- linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.c 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/bootsplash.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/bootsplash.c linux-2.6.27/drivers/video/bootsplash/bootsplash.c +--- linux-2.6.27.orig/drivers/video/bootsplash/bootsplash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/bootsplash.c 2009-03-10 03:32:23.490797270 +0100 @@ -0,0 +1,983 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.c - @@ -1058,9 +1058,9 @@ + return; +} + -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.h linux-2.6.21/drivers/video/bootsplash/bootsplash.h ---- linux-2.6.21-orig/drivers/video/bootsplash/bootsplash.h 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/bootsplash.h 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/bootsplash.h linux-2.6.27/drivers/video/bootsplash/bootsplash.h +--- linux-2.6.27.orig/drivers/video/bootsplash/bootsplash.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/bootsplash.h 2009-03-10 03:32:23.501630114 +0100 @@ -0,0 +1,44 @@ +/* + * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition. @@ -1106,9 +1106,9 @@ +extern void release_console_sem(void); + +#endif -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.c linux-2.6.21/drivers/video/bootsplash/decode-jpg.c ---- linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.c 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/decode-jpg.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/decode-jpg.c linux-2.6.27/drivers/video/bootsplash/decode-jpg.c +--- linux-2.6.27.orig/drivers/video/bootsplash/decode-jpg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/decode-jpg.c 2009-03-10 03:32:23.501630114 +0100 @@ -0,0 +1,957 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder. @@ -2067,9 +2067,9 @@ + outy += 64 * 2 - 16 * 4; + } +} -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.h linux-2.6.21/drivers/video/bootsplash/decode-jpg.h ---- linux-2.6.21-orig/drivers/video/bootsplash/decode-jpg.h 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/decode-jpg.h 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/decode-jpg.h linux-2.6.27/drivers/video/bootsplash/decode-jpg.h +--- linux-2.6.27.orig/drivers/video/bootsplash/decode-jpg.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/decode-jpg.h 2009-03-10 03:32:23.501630114 +0100 @@ -0,0 +1,35 @@ +/* + * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder. @@ -2106,9 +2106,9 @@ +extern int jpeg_check_size(unsigned char *, int, int); + +#endif -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/Kconfig linux-2.6.21/drivers/video/bootsplash/Kconfig ---- linux-2.6.21-orig/drivers/video/bootsplash/Kconfig 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/Kconfig 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/Kconfig linux-2.6.27/drivers/video/bootsplash/Kconfig +--- linux-2.6.27.orig/drivers/video/bootsplash/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/Kconfig 2009-03-10 03:32:23.501630114 +0100 @@ -0,0 +1,17 @@ +# +# Bootsplash configuration @@ -2127,18 +2127,18 @@ + If you are unsure, say N +endmenu + -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/Makefile linux-2.6.21/drivers/video/bootsplash/Makefile ---- linux-2.6.21-orig/drivers/video/bootsplash/Makefile 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/Makefile 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/Makefile linux-2.6.27/drivers/video/bootsplash/Makefile +--- linux-2.6.27.orig/drivers/video/bootsplash/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/Makefile 2009-03-10 03:32:23.501630114 +0100 @@ -0,0 +1,5 @@ +# Makefile for the Linux bootsplash + +obj-$(CONFIG_BOOTSPLASH) += bootsplash.o +obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o +obj-$(CONFIG_BOOTSPLASH) += render.o -diff -urN linux-2.6.21-orig/drivers/video/bootsplash/render.c linux-2.6.21/drivers/video/bootsplash/render.c ---- linux-2.6.21-orig/drivers/video/bootsplash/render.c 1970-01-01 03:00:00.000000000 +0300 -+++ linux-2.6.21/drivers/video/bootsplash/render.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/bootsplash/render.c linux-2.6.27/drivers/video/bootsplash/render.c +--- linux-2.6.27.orig/drivers/video/bootsplash/render.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.27/drivers/video/bootsplash/render.c 2009-03-10 03:32:23.504959697 +0100 @@ -0,0 +1,315 @@ +/* + * linux/drivers/video/bootsplash/render.c - splash screen render functions. @@ -2318,7 +2318,7 @@ + int sx, int height, int width) +{ + int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; -+ int bg_color = attr_bgcol_ec(bgshift, vc); ++ int bg_color = attr_bgcol_ec(bgshift, vc, info); + int transparent = sd->splash_color == bg_color; + u32 bgx; + u8 *dst; @@ -2455,9 +2455,9 @@ + } +} + -diff -urN linux-2.6.21-orig/drivers/video/console/bitblit.c linux-2.6.21/drivers/video/console/bitblit.c ---- linux-2.6.21-orig/drivers/video/console/bitblit.c 2007-02-04 21:44:54.000000000 +0300 -+++ linux-2.6.21/drivers/video/console/bitblit.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/console/bitblit.c linux-2.6.27/drivers/video/console/bitblit.c +--- linux-2.6.27.orig/drivers/video/console/bitblit.c 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/video/console/bitblit.c 2009-03-10 03:36:21.042855706 +0100 @@ -17,6 +17,9 @@ #include <linux/console.h> #include <asm/types.h> @@ -2482,7 +2482,7 @@ area.sx = sx * vc->vc_font.width; area.sy = sy * vc->vc_font.height; area.dx = dx * vc->vc_font.width; -@@ -63,6 +73,13 @@ +@@ -63,6 +73,14 @@ int bgshift = (vc->vc_hi_font_mask) ? 13 : 12; struct fb_fillrect region; @@ -2493,10 +2493,11 @@ + return; + } +#endif - region.color = attr_bgcol_ec(bgshift, vc); ++ + region.color = attr_bgcol_ec(bgshift, vc, info); region.dx = sx * vc->vc_font.width; region.dy = sy * vc->vc_font.height; -@@ -160,6 +177,13 @@ +@@ -160,6 +178,13 @@ image.height = vc->vc_font.height; image.depth = 1; @@ -2510,7 +2511,7 @@ if (attribute) { buf = kmalloc(cellsize, GFP_KERNEL); if (!buf) -@@ -213,6 +237,13 @@ +@@ -213,6 +238,13 @@ unsigned int bs = info->var.yres - bh; struct fb_fillrect region; @@ -2521,10 +2522,10 @@ + } +#endif + - region.color = 0; + region.color = attr_bgcol_ec(bgshift, vc, info); region.rop = ROP_COPY; -@@ -379,6 +410,14 @@ +@@ -379,6 +411,14 @@ cursor.image.depth = 1; cursor.rop = ROP_XOR; @@ -2539,9 +2540,9 @@ if (info->fbops->fb_cursor) err = info->fbops->fb_cursor(info, &cursor); -diff -urN linux-2.6.21-orig/drivers/video/console/fbcon.c linux-2.6.21/drivers/video/console/fbcon.c ---- linux-2.6.21-orig/drivers/video/console/fbcon.c 2007-04-26 10:58:53.000000000 +0300 -+++ linux-2.6.21/drivers/video/console/fbcon.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/console/fbcon.c linux-2.6.27/drivers/video/console/fbcon.c +--- linux-2.6.27.orig/drivers/video/console/fbcon.c 2009-03-10 03:29:51.177256144 +0100 ++++ linux-2.6.27/drivers/video/console/fbcon.c 2009-03-10 03:32:23.508284063 +0100 @@ -91,6 +91,10 @@ #include "fbcon.h" @@ -2551,7 +2552,7 @@ +#endif + #ifdef FBCONDEBUG - # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) + # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) #else @@ -104,8 +108,7 @@ }; @@ -2561,9 +2562,9 @@ -static signed char con2fb_map[MAX_NR_CONSOLES]; +signed char con2fb_map[MAX_NR_CONSOLES]; static signed char con2fb_map_boot[MAX_NR_CONSOLES]; - static int logo_height; + static int logo_lines; -@@ -563,6 +566,10 @@ +@@ -578,6 +581,10 @@ for (i = first_fb_vc; i <= last_fb_vc; i++) con2fb_map[i] = info_idx; @@ -2574,7 +2575,7 @@ err = take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default); -@@ -1125,6 +1132,16 @@ +@@ -1180,6 +1187,16 @@ new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); new_cols /= vc->vc_font.width; new_rows /= vc->vc_font.height; @@ -2591,7 +2592,7 @@ vc_resize(vc, new_cols, new_rows); /* -@@ -1770,6 +1787,10 @@ +@@ -1875,6 +1892,10 @@ fbcon_softback_note(vc, t, count); if (logo_shown >= 0) goto redraw_up; @@ -2601,8 +2602,8 @@ +#endif switch (p->scrollmode) { case SCROLL_MOVE: - ops->bmove(vc, info, t + count, 0, t, 0, -@@ -1854,6 +1875,10 @@ + fbcon_redraw_blit(vc, info, p, t, b - t - count, +@@ -1964,6 +1985,10 @@ case SM_DOWN: if (count > vc->vc_rows) /* Maximum realistic size */ count = vc->vc_rows; @@ -2613,7 +2614,7 @@ if (logo_shown >= 0) goto redraw_down; switch (p->scrollmode) { -@@ -1998,6 +2023,14 @@ +@@ -2114,6 +2139,14 @@ } return; } @@ -2628,7 +2629,7 @@ ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx, height, width); } -@@ -2106,6 +2139,10 @@ +@@ -2222,6 +2255,10 @@ info = registered_fb[con2fb_map[vc->vc_num]]; ops = info->fbcon_par; @@ -2639,7 +2640,7 @@ if (softback_top) { if (softback_lines) fbcon_set_origin(vc); -@@ -2235,6 +2272,12 @@ +@@ -2349,6 +2386,12 @@ { struct fb_event event; @@ -2652,7 +2653,7 @@ if (blank) { unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff; -@@ -2433,10 +2476,19 @@ +@@ -2551,10 +2594,19 @@ if (resize) { int cols, rows; @@ -2672,9 +2673,9 @@ vc_resize(vc, cols, rows); if (CON_IS_VISIBLE(vc) && softback_buf) fbcon_update_softback(vc); -diff -urN linux-2.6.21-orig/drivers/video/console/fbcon.h linux-2.6.21/drivers/video/console/fbcon.h ---- linux-2.6.21-orig/drivers/video/console/fbcon.h 2007-04-26 10:58:53.000000000 +0300 -+++ linux-2.6.21/drivers/video/console/fbcon.h 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/console/fbcon.h linux-2.6.27/drivers/video/console/fbcon.h +--- linux-2.6.27.orig/drivers/video/console/fbcon.h 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/video/console/fbcon.h 2009-03-10 03:32:23.508284063 +0100 @@ -25,6 +25,34 @@ * low-level frame buffer device */ @@ -2710,10 +2711,10 @@ struct display { /* Filled in by the low-level console driver */ const u_char *fontdata; -diff -urN linux-2.6.21-orig/drivers/video/Kconfig linux-2.6.21/drivers/video/Kconfig ---- linux-2.6.21-orig/drivers/video/Kconfig 2007-04-26 10:58:53.000000000 +0300 -+++ linux-2.6.21/drivers/video/Kconfig 2007-04-26 11:29:26.000000000 +0300 -@@ -1663,5 +1663,9 @@ +diff -Nur linux-2.6.27.orig/drivers/video/Kconfig linux-2.6.27/drivers/video/Kconfig +--- linux-2.6.27.orig/drivers/video/Kconfig 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/video/Kconfig 2009-03-10 03:32:23.508284063 +0100 +@@ -2054,4 +2054,8 @@ source "drivers/video/logo/Kconfig" endif @@ -2722,11 +2723,10 @@ +endif + endmenu - -diff -urN linux-2.6.21-orig/drivers/video/Makefile linux-2.6.21/drivers/video/Makefile ---- linux-2.6.21-orig/drivers/video/Makefile 2007-04-26 10:58:53.000000000 +0300 -+++ linux-2.6.21/drivers/video/Makefile 2007-04-26 11:29:26.000000000 +0300 -@@ -13,6 +13,7 @@ +diff -Nur linux-2.6.27.orig/drivers/video/Makefile linux-2.6.27/drivers/video/Makefile +--- linux-2.6.27.orig/drivers/video/Makefile 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/video/Makefile 2009-03-10 03:32:23.508284063 +0100 +@@ -14,6 +14,7 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ obj-y += backlight/ display/ @@ -2734,9 +2734,9 @@ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o -diff -urN linux-2.6.21-orig/drivers/video/vesafb.c linux-2.6.21/drivers/video/vesafb.c ---- linux-2.6.21-orig/drivers/video/vesafb.c 2007-02-04 21:44:54.000000000 +0300 -+++ linux-2.6.21/drivers/video/vesafb.c 2007-04-26 11:29:26.000000000 +0300 +diff -Nur linux-2.6.27.orig/drivers/video/vesafb.c linux-2.6.27/drivers/video/vesafb.c +--- linux-2.6.27.orig/drivers/video/vesafb.c 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/drivers/video/vesafb.c 2009-03-10 03:32:23.508284063 +0100 @@ -174,7 +174,10 @@ return err; } @@ -2761,10 +2761,10 @@ if (vram_remap) size_remap = vram_remap * 1024 * 1024; if (size_remap < size_vmode) -diff -urN linux-2.6.21-orig/include/linux/console_struct.h linux-2.6.21/include/linux/console_struct.h ---- linux-2.6.21-orig/include/linux/console_struct.h 2007-04-26 10:58:54.000000000 +0300 -+++ linux-2.6.21/include/linux/console_struct.h 2007-04-26 11:29:26.000000000 +0300 -@@ -99,6 +99,11 @@ +diff -Nur linux-2.6.27.orig/include/linux/console_struct.h linux-2.6.27/include/linux/console_struct.h +--- linux-2.6.27.orig/include/linux/console_struct.h 2009-03-10 03:29:51.307469109 +0100 ++++ linux-2.6.27/include/linux/console_struct.h 2009-03-10 03:32:23.511617015 +0100 +@@ -106,6 +106,11 @@ struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ unsigned long vc_uni_pagedir; unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ @@ -2776,10 +2776,10 @@ /* additional information is in vt_kern.h */ }; -diff -urN linux-2.6.21-orig/include/linux/fb.h linux-2.6.21/include/linux/fb.h ---- linux-2.6.21-orig/include/linux/fb.h 2007-04-26 10:58:54.000000000 +0300 -+++ linux-2.6.21/include/linux/fb.h 2007-04-26 11:29:26.000000000 +0300 -@@ -795,6 +795,14 @@ +diff -Nur linux-2.6.27.orig/include/linux/fb.h linux-2.6.27/include/linux/fb.h +--- linux-2.6.27.orig/include/linux/fb.h 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/include/linux/fb.h 2009-03-10 03:32:23.511617015 +0100 +@@ -849,6 +849,14 @@ void *fbcon_par; /* fbcon use-only private area */ /* From here on everything is device dependent */ void *par; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-bootsplash.patch?r1=1.3&r2=1.3.2.1&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit