summaryrefslogtreecommitdiff
path: root/drivers/video/console
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2009-11-13 14:57:02 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-11-13 15:55:02 -0800
commitb434a680a29424856e0f40199daa9f65963c7cb4 (patch)
tree95784d97c5271f2d3e8657d9428f4fabef11d7d4 /drivers/video/console
parentf6c06b6807ff9281295989ebad72523865325a4f (diff)
vgacon: Add support for setting the default cursor state
Pass the vga cursor state to the vt layer, ensuring that we don't hide the cursor when the bootloader has deliberately disabled it. Signed-off-by: Matthew Garrett <mjg@redhat.com> LKML-Reference: <1258142222-16092-3-git-send-email-mjg@redhat.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'drivers/video/console')
-rw-r--r--drivers/video/console/vgacon.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 564643edb3c1..cc4bbbe44aca 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -586,7 +586,10 @@ static void vgacon_init(struct vc_data *c, int init)
if (!vgacon_uni_pagedir[0] && p)
con_set_default_unimap(c);
- hide_boot_cursor(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
+ /* Only set the default if the user didn't deliberately override it */
+ if (global_cursor_default == -1)
+ global_cursor_default =
+ !(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
}
static void vgacon_deinit(struct vc_data *c)