|
38 | 38 | * |
39 | 39 | * - Arno Griffioen <[email protected]> |
40 | 40 | * - David Carter <[email protected]> |
41 | | - * |
| 41 | + * |
42 | 42 | * The abstract console driver provides a generic interface for a text |
43 | 43 | * console. It supports VGA text mode, frame buffer based graphical consoles |
44 | 44 | * and special graphics processors that are only accessible through some |
@@ -158,9 +158,12 @@ static void unblank_screen(void); |
158 | 158 |
|
159 | 159 | int default_utf8 = true; |
160 | 160 | module_param(default_utf8, int, S_IRUGO | S_IWUSR); |
161 | | -int global_cursor_default = -1; |
| 161 | +int global_cursor_default = 0; |
162 | 162 | module_param(global_cursor_default, int, S_IRUGO | S_IWUSR); |
163 | 163 | EXPORT_SYMBOL(global_cursor_default); |
| 164 | +int default_screen_mode = -1; |
| 165 | +module_param(default_screen_mode, int, S_IRUGO | S_IWUSR); |
| 166 | +EXPORT_SYMBOL(default_screen_mode); |
164 | 167 |
|
165 | 168 | static int cur_default = CUR_UNDERLINE; |
166 | 169 | module_param(cur_default, int, S_IRUGO | S_IWUSR); |
@@ -1086,9 +1089,12 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ |
1086 | 1089 | goto err_free; |
1087 | 1090 |
|
1088 | 1091 | /* If no drivers have overridden us and the user didn't pass a |
1089 | | - boot option, default to displaying the cursor */ |
| 1092 | + boot option, default to displaying the cursor and normal |
| 1093 | + screen mode */ |
1090 | 1094 | if (global_cursor_default == -1) |
1091 | 1095 | global_cursor_default = 1; |
| 1096 | + if (default_screen_mode == -1) |
| 1097 | + default_screen_mode = 1; |
1092 | 1098 |
|
1093 | 1099 | vc_init(vc, 1); |
1094 | 1100 | vcs_make_sysfs(currcons); |
@@ -2155,7 +2161,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear) |
2155 | 2161 | vc->vc_disp_ctrl = 0; |
2156 | 2162 | vc->vc_toggle_meta = 0; |
2157 | 2163 |
|
2158 | | - vc->vc_decscnm = 0; |
| 2164 | + vc->vc_decscnm = default_screen_mode; |
2159 | 2165 | vc->vc_decom = 0; |
2160 | 2166 | vc->vc_decawm = 1; |
2161 | 2167 | vc->vc_deccm = global_cursor_default; |
|
0 commit comments