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>

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 564643edb3c159a35f14292398670bfe112550f5..cc4bbbe44aca6b4672568f5ee36d27bdc1b17222 100644 (file)
--- 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)