vgacon: Add support for setting the default cursor state
authorMatthew Garrett <mjg@redhat.com>
Fri, 13 Nov 2009 19:57:02 +0000 (14:57 -0500)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 13 Nov 2009 23:55:02 +0000 (15:55 -0800)
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

index 564643edb3c159a35f14292398670bfe112550f5..cc4bbbe44aca6b4672568f5ee36d27bdc1b17222 100644 (file)
@@ -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)