diff options
Diffstat (limited to 'drivers/video/console')
-rw-r--r-- | drivers/video/console/Kconfig | 1 | ||||
-rw-r--r-- | drivers/video/console/bitblit.c | 1 | ||||
-rw-r--r-- | drivers/video/console/fbcon.c | 18 | ||||
-rw-r--r-- | drivers/video/console/fbcon_ccw.c | 1 | ||||
-rw-r--r-- | drivers/video/console/fbcon_cw.c | 1 | ||||
-rw-r--r-- | drivers/video/console/fbcon_rotate.c | 1 | ||||
-rw-r--r-- | drivers/video/console/fbcon_ud.c | 1 | ||||
-rw-r--r-- | drivers/video/console/mdacon.c | 1 | ||||
-rw-r--r-- | drivers/video/console/sticore.c | 2 | ||||
-rw-r--r-- | drivers/video/console/vgacon.c | 7 |
10 files changed, 31 insertions, 3 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index fc7d9bbb548c..8e8f18d29d7a 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -37,6 +37,7 @@ config VGACON_SOFT_SCROLLBACK | |||
37 | config VGACON_SOFT_SCROLLBACK_SIZE | 37 | config VGACON_SOFT_SCROLLBACK_SIZE |
38 | int "Scrollback Buffer Size (in KB)" | 38 | int "Scrollback Buffer Size (in KB)" |
39 | depends on VGACON_SOFT_SCROLLBACK | 39 | depends on VGACON_SOFT_SCROLLBACK |
40 | range 1 1024 | ||
40 | default "64" | 41 | default "64" |
41 | help | 42 | help |
42 | Enter the amount of System RAM to allocate for the scrollback | 43 | Enter the amount of System RAM to allocate for the scrollback |
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index 6b7c8fbc5495..af88651b0735 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/slab.h> | ||
14 | #include <linux/string.h> | 15 | #include <linux/string.h> |
15 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
16 | #include <linux/vt_kern.h> | 17 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 3681c6a88212..b0a3fa00706d 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -3025,6 +3025,20 @@ static int fbcon_fb_unregistered(struct fb_info *info) | |||
3025 | return 0; | 3025 | return 0; |
3026 | } | 3026 | } |
3027 | 3027 | ||
3028 | static void fbcon_remap_all(int idx) | ||
3029 | { | ||
3030 | int i; | ||
3031 | for (i = first_fb_vc; i <= last_fb_vc; i++) | ||
3032 | set_con2fb_map(i, idx, 0); | ||
3033 | |||
3034 | if (con_is_bound(&fb_con)) { | ||
3035 | printk(KERN_INFO "fbcon: Remapping primary device, " | ||
3036 | "fb%i, to tty %i-%i\n", idx, | ||
3037 | first_fb_vc + 1, last_fb_vc + 1); | ||
3038 | info_idx = idx; | ||
3039 | } | ||
3040 | } | ||
3041 | |||
3028 | #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY | 3042 | #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY |
3029 | static void fbcon_select_primary(struct fb_info *info) | 3043 | static void fbcon_select_primary(struct fb_info *info) |
3030 | { | 3044 | { |
@@ -3225,6 +3239,10 @@ static int fbcon_event_notify(struct notifier_block *self, | |||
3225 | caps = event->data; | 3239 | caps = event->data; |
3226 | fbcon_get_requirement(info, caps); | 3240 | fbcon_get_requirement(info, caps); |
3227 | break; | 3241 | break; |
3242 | case FB_EVENT_REMAP_ALL_CONSOLE: | ||
3243 | idx = info->node; | ||
3244 | fbcon_remap_all(idx); | ||
3245 | break; | ||
3228 | } | 3246 | } |
3229 | done: | 3247 | done: |
3230 | return ret; | 3248 | return ret; |
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c index bdf913ecf001..d135671d9961 100644 --- a/drivers/video/console/fbcon_ccw.c +++ b/drivers/video/console/fbcon_ccw.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/slab.h> | ||
12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c index a6819b9d1770..126110f8454f 100644 --- a/drivers/video/console/fbcon_cw.c +++ b/drivers/video/console/fbcon_cw.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/slab.h> | ||
12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c index 00884e013f0f..db6528f2d3f2 100644 --- a/drivers/video/console/fbcon_rotate.c +++ b/drivers/video/console/fbcon_rotate.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/slab.h> | ||
12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c index d9b5d6eb68a7..93a3e7381b50 100644 --- a/drivers/video/console/fbcon_ud.c +++ b/drivers/video/console/fbcon_ud.c | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/slab.h> | ||
12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c index dd3eaaad4441..0b67866cae10 100644 --- a/drivers/video/console/mdacon.c +++ b/drivers/video/console/mdacon.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/console.h> | 33 | #include <linux/console.h> |
34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
35 | #include <linux/kd.h> | 35 | #include <linux/kd.h> |
36 | #include <linux/slab.h> | ||
37 | #include <linux/vt_kern.h> | 36 | #include <linux/vt_kern.h> |
38 | #include <linux/vt_buffer.h> | 37 | #include <linux/vt_buffer.h> |
39 | #include <linux/selection.h> | 38 | #include <linux/selection.h> |
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 857b3668b3ba..6468a297e341 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c | |||
@@ -436,7 +436,7 @@ sti_init_glob_cfg(struct sti_struct *sti, | |||
436 | (offs < PCI_BASE_ADDRESS_0 || | 436 | (offs < PCI_BASE_ADDRESS_0 || |
437 | offs > PCI_BASE_ADDRESS_5)) { | 437 | offs > PCI_BASE_ADDRESS_5)) { |
438 | printk (KERN_WARNING | 438 | printk (KERN_WARNING |
439 | "STI pci region maping for region %d (%02x) can't be mapped\n", | 439 | "STI pci region mapping for region %d (%02x) can't be mapped\n", |
440 | i,sti->rm_entry[i]); | 440 | i,sti->rm_entry[i]); |
441 | continue; | 441 | continue; |
442 | } | 442 | } |
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index da55ccaf4d55..182dd6f8aadd 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c | |||
@@ -112,7 +112,7 @@ static int vga_video_font_height; | |||
112 | static int vga_scan_lines __read_mostly; | 112 | static int vga_scan_lines __read_mostly; |
113 | static unsigned int vga_rolled_over; | 113 | static unsigned int vga_rolled_over; |
114 | 114 | ||
115 | int vgacon_text_mode_force = 0; | 115 | static int vgacon_text_mode_force; |
116 | 116 | ||
117 | bool vgacon_text_force(void) | 117 | bool vgacon_text_force(void) |
118 | { | 118 | { |
@@ -585,6 +585,11 @@ static void vgacon_init(struct vc_data *c, int init) | |||
585 | vgacon_uni_pagedir[1]++; | 585 | vgacon_uni_pagedir[1]++; |
586 | if (!vgacon_uni_pagedir[0] && p) | 586 | if (!vgacon_uni_pagedir[0] && p) |
587 | con_set_default_unimap(c); | 587 | con_set_default_unimap(c); |
588 | |||
589 | /* Only set the default if the user didn't deliberately override it */ | ||
590 | if (global_cursor_default == -1) | ||
591 | global_cursor_default = | ||
592 | !(screen_info.flags & VIDEO_FLAGS_NOCURSOR); | ||
588 | } | 593 | } |
589 | 594 | ||
590 | static void vgacon_deinit(struct vc_data *c) | 595 | static void vgacon_deinit(struct vc_data *c) |