[tip:x86/setup] vgacon: Add support for setting the default cursor state

tip-bot for Matthew Garrett
2009-11-14T00:10:24Z

Commit-ID: b434a680a29424856e0f40199daa9f65963c7cb4
Gitweb: http://git.kernel.org/tip/b434a680a29424856e0f40199daa9f65963c7cb4
Author: Matthew Garrett <mjg@redhat.com>
AuthorDate: Fri, 13 Nov 2009 14:57:02 -0500
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Fri, 13 Nov 2009 15:55:02 -0800

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>
---
drivers/video/console/vgacon.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 564643e..cc4bbbe 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)