SOURCES (LINUX_2_6): kernel-fbsplash.patch - up to 2.6.15-rc2
sparky
sparky at pld-linux.org
Fri Mar 10 13:49:46 CET 2006
Author: sparky Date: Fri Mar 10 12:49:46 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- up to 2.6.15-rc2
---- Files affected:
SOURCES:
kernel-fbsplash.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: SOURCES/kernel-fbsplash.patch
diff -u SOURCES/kernel-fbsplash.patch:1.1.2.1 SOURCES/kernel-fbsplash.patch:1.1.2.2
--- SOURCES/kernel-fbsplash.patch:1.1.2.1 Sat Jan 21 13:59:04 2006
+++ SOURCES/kernel-fbsplash.patch Fri Mar 10 13:49:40 2006
@@ -224,11 +224,36 @@
+Fbsplash, splash protocol design, current implementation & docs by:
+ Michael Januszewski <spock at gentoo.org>
+
+diff --git a/drivers/Makefile b/drivers/Makefile
+index 619dd96..54d2f29 100644
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -8,6 +8,9 @@
+ obj-$(CONFIG_PCI) += pci/
+ obj-$(CONFIG_PARISC) += parisc/
+ obj-$(CONFIG_RAPIDIO) += rapidio/
++# char/ comes before serial/ etc so that the VT console is the boot-time
++# default.
++obj-y += char/
+ obj-y += video/
+ obj-$(CONFIG_ACPI) += acpi/
+ # PnP must come after ACPI since it will eventually need to check if acpi
+@@ -15,10 +18,6 @@ obj-$(CONFIG_ACPI) += acpi/
+ obj-$(CONFIG_PNP) += pnp/
+ obj-$(CONFIG_ARM_AMBA) += amba/
+
+-# char/ comes before serial/ etc so that the VT console is the boot-time
+-# default.
+-obj-y += char/
+-
+ obj-$(CONFIG_CONNECTOR) += connector/
+
+ # i810fb and intelfb depend on char/agp/
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
-index 25b6ca6..dac3de5 100644
+index 3e153d3..9444a96 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
-@@ -752,7 +752,6 @@ config FB_MATROX
+@@ -759,7 +759,6 @@ config FB_MATROX
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
@@ -236,7 +261,7 @@
select FB_MACMODES if PPC_PMAC
---help---
Say Y here if you have a Matrox Millennium, Matrox Millennium II,
-@@ -1468,5 +1467,15 @@ if FB && SYSFS
+@@ -1463,5 +1462,15 @@ if FB && SYSFS
source "drivers/video/backlight/Kconfig"
endif
@@ -744,7 +769,7 @@
+}
+
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c
-index e65fc3e..b8fcb6e 100644
+index eea422e..f7eb288 100644
--- a/drivers/video/console/bitblit.c
+++ b/drivers/video/console/bitblit.c
@@ -18,6 +18,7 @@
@@ -790,7 +815,7 @@
ops->cursor_reset = 0;
}
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
-index e7802ff..eeddc61 100644
+index 041d069..945b5b0 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -93,6 +93,7 @@
@@ -801,16 +826,16 @@
#ifdef FBCONDEBUG
# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-@@ -109,7 +110,7 @@ enum {
- struct display fb_display[MAX_NR_CONSOLES];
- EXPORT_SYMBOL(fb_display);
+@@ -108,7 +109,7 @@ enum {
+
+ static struct display fb_display[MAX_NR_CONSOLES];
-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;
-@@ -299,7 +300,7 @@ static inline int fbcon_is_inactive(stru
+@@ -298,7 +299,7 @@ static inline int fbcon_is_inactive(stru
vc->vc_mode != KD_TEXT || ops->graphics);
}
@@ -819,15 +844,15 @@
u16 c, int is_fg)
{
int depth = fb_get_color_depth(&info->var, &info->fix);
-@@ -405,6 +406,7 @@ static void fb_flashcursor(void *private
+@@ -404,6 +405,7 @@ static void fb_flashcursor(void *private
CM_ERASE : CM_DRAW;
- ops->cursor(vc, info, p, mode, softback_lines, get_color(vc, info, c, 1),
+ ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
get_color(vc, info, c, 0));
+
release_console_sem();
}
-@@ -569,6 +571,8 @@ static int fbcon_takeover(int show_logo)
+@@ -568,6 +570,8 @@ static int fbcon_takeover(int show_logo)
info_idx = -1;
}
@@ -836,7 +861,7 @@
return err;
}
-@@ -978,6 +982,12 @@ static const char *fbcon_startup(void)
+@@ -971,6 +975,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;
@@ -849,7 +874,7 @@
vc_resize(vc, cols, rows);
DPRINTK("mode: %s\n", info->fix.id);
-@@ -1060,7 +1070,7 @@ static void fbcon_init(struct vc_data *v
+@@ -1053,7 +1063,7 @@ static void fbcon_init(struct vc_data *v
cap = info->flags;
if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
@@ -858,7 +883,7 @@
logo = 0;
if (var_to_display(p, &info->var, info))
-@@ -1200,6 +1210,11 @@ static void fbcon_clear(struct vc_data *
+@@ -1193,6 +1203,11 @@ static void fbcon_clear(struct vc_data *
if (!height || !width)
return;
@@ -870,7 +895,7 @@
/* Split blits that cross physical y_wrap boundary */
y_break = p->vrows - p->yscroll;
-@@ -1219,10 +1234,15 @@ static void fbcon_putcs(struct vc_data *
+@@ -1212,10 +1227,15 @@ static void fbcon_putcs(struct vc_data *
struct display *p = &fb_display[vc->vc_num];
struct fbcon_ops *ops = info->fbcon_par;
@@ -890,7 +915,7 @@
}
static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
-@@ -1238,8 +1258,13 @@ static void fbcon_clear_margins(struct v
+@@ -1231,8 +1251,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;
@@ -906,7 +931,7 @@
}
static void fbcon_cursor(struct vc_data *vc, int mode)
-@@ -1719,7 +1744,7 @@ static int fbcon_scroll(struct vc_data *
+@@ -1705,7 +1730,7 @@ static int fbcon_scroll(struct vc_data *
count = vc->vc_rows;
if (softback_top)
fbcon_softback_note(vc, t, count);
@@ -915,7 +940,7 @@
goto redraw_up;
switch (p->scrollmode) {
case SCROLL_MOVE:
-@@ -1807,6 +1832,8 @@ static int fbcon_scroll(struct vc_data *
+@@ -1793,6 +1818,8 @@ static int fbcon_scroll(struct vc_data *
count = vc->vc_rows;
if (logo_shown >= 0)
goto redraw_down;
@@ -924,7 +949,7 @@
switch (p->scrollmode) {
case SCROLL_MOVE:
ops->bmove(vc, info, t, 0, t + count, 0,
-@@ -1949,6 +1976,13 @@ static void fbcon_bmove_rec(struct vc_da
+@@ -1935,6 +1962,13 @@ static void fbcon_bmove_rec(struct vc_da
}
return;
}
@@ -938,7 +963,7 @@
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
-@@ -2018,8 +2052,9 @@ static int fbcon_resize(struct vc_data *
+@@ -2005,8 +2039,9 @@ 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;
@@ -950,7 +975,7 @@
struct fb_videomode *mode;
DPRINTK("attempting resize %ix%i\n", var.xres, var.yres);
-@@ -2055,7 +2090,26 @@ static int fbcon_switch(struct vc_data *
+@@ -2042,7 +2077,26 @@ static int fbcon_switch(struct vc_data *
info = registered_fb[con2fb_map[vc->vc_num]];
ops = info->fbcon_par;
@@ -978,7 +1003,7 @@
if (softback_top) {
if (softback_lines)
fbcon_set_origin(vc);
-@@ -2073,9 +2127,6 @@ static int fbcon_switch(struct vc_data *
+@@ -2060,9 +2114,6 @@ static int fbcon_switch(struct vc_data *
logo_shown = FBCON_LOGO_CANSHOW;
}
@@ -988,7 +1013,7 @@
/*
* FIXME: If we have multiple fbdev's loaded, we need to
* update all info->currcon. Perhaps, we can place this
-@@ -2113,6 +2164,11 @@ static int fbcon_switch(struct vc_data *
+@@ -2104,6 +2155,11 @@ static int fbcon_switch(struct vc_data *
fbcon_add_cursor_timer(info);
}
@@ -1000,7 +1025,7 @@
set_blitting_type(vc, info, p);
ops->cursor_reset = 1;
-@@ -2200,8 +2256,12 @@ static int fbcon_blank(struct vc_data *v
+@@ -2205,8 +2261,12 @@ static int fbcon_blank(struct vc_data *v
fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
ops->cursor_flash = (!blank);
@@ -1015,7 +1040,7 @@
}
if (!blank)
-@@ -2359,13 +2419,22 @@ static int fbcon_do_set_font(struct vc_d
+@@ -2364,13 +2424,22 @@ static int fbcon_do_set_font(struct vc_d
}
if (resize) {
@@ -1038,7 +1063,7 @@
if (CON_IS_VISIBLE(vc) && softback_buf)
fbcon_update_softback(vc);
} else if (CON_IS_VISIBLE(vc)
-@@ -2483,7 +2552,7 @@ static int fbcon_set_palette(struct vc_d
+@@ -2488,7 +2557,7 @@ static int fbcon_set_palette(struct vc_d
int i, j, k, depth;
u8 val;
@@ -1047,7 +1072,7 @@
return -EINVAL;
if (!CON_IS_VISIBLE(vc))
-@@ -2509,7 +2578,49 @@ static int fbcon_set_palette(struct vc_d
+@@ -2514,7 +2583,49 @@ static int fbcon_set_palette(struct vc_d
} else
fb_copy_cmap(fb_default_cmap(1 << depth), &palette_cmap);
@@ -1098,7 +1123,7 @@
}
static u16 *fbcon_screen_pos(struct vc_data *vc, int offset)
-@@ -2735,7 +2846,14 @@ static void fbcon_modechanged(struct fb_
+@@ -2740,7 +2851,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;
@@ -1691,7 +1716,7 @@
};
diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 04a58f3..b8b8fab 100644
+index 2cb19e6..c45e177 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -8,6 +8,13 @@
@@ -1725,7 +1750,7 @@
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */
-@@ -751,6 +766,9 @@ struct fb_info {
+@@ -769,6 +784,9 @@ struct fb_info {
#define FBINFO_STATE_SUSPENDED 1
u32 state; /* Hardware state i.e suspend */
void *fbcon_par; /* fbcon use-only private area */
@@ -1736,10 +1761,10 @@
void *par;
};
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
-index 64f203c..143e3ed 100644
+index 32a4139..506a18d 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
-@@ -147,6 +147,7 @@ enum
+@@ -146,6 +146,7 @@ enum
KERN_RANDOMIZE=68, /* int: randomize virtual address space */
KERN_SETUID_DUMPABLE=69, /* int: behaviour of dumps for setuid core */
KERN_SPIN_RETRY=70, /* int: number of spinlock retries */
@@ -1748,12 +1773,12 @@
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 9990e10..47a2552 100644
+index 71dd6f6..4ab6989 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -86,6 +86,9 @@ extern char modprobe_path[];
- #ifdef CONFIG_HOTPLUG
- extern char hotplug_path[];
+@@ -88,6 +88,9 @@ static int ngroups_max = NGROUPS_MAX;
+ #ifdef CONFIG_KMOD
+ extern char modprobe_path[];
#endif
+#ifdef CONFIG_FB_SPLASH
+extern char fbsplash_path[];
@@ -1761,7 +1786,7 @@
#ifdef CONFIG_CHR_DEV_SG
extern int sg_big_buff;
#endif
-@@ -404,6 +407,17 @@ static ctl_table kern_table[] = {
+@@ -406,6 +409,17 @@ static ctl_table kern_table[] = {
.strategy = &sysctl_string,
},
#endif
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-fbsplash.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list