diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/console/fbcon.c | 18 | ||||
-rw-r--r-- | drivers/video/fbmem.c | 1 |
2 files changed, 18 insertions, 1 deletions
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/fbmem.c b/drivers/video/fbmem.c index 99bbd282ce63..a15b44e9c003 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -1513,7 +1513,6 @@ register_framebuffer(struct fb_info *fb_info) | |||
1513 | fb_info->fix.id, | 1513 | fb_info->fix.id, |
1514 | registered_fb[i]->fix.id); | 1514 | registered_fb[i]->fix.id); |
1515 | unregister_framebuffer(registered_fb[i]); | 1515 | unregister_framebuffer(registered_fb[i]); |
1516 | break; | ||
1517 | } | 1516 | } |
1518 | } | 1517 | } |
1519 | } | 1518 | } |