|
@@ -964,10 +964,13 @@ static const char *fbcon_startup(void)
|
|
ops->cur_blink_jiffies = HZ / 5;
|
|
ops->cur_blink_jiffies = HZ / 5;
|
|
ops->info = info;
|
|
ops->info = info;
|
|
info->fbcon_par = ops;
|
|
info->fbcon_par = ops;
|
|
- if (initial_rotation != -1)
|
|
|
|
- p->con_rotate = initial_rotation;
|
|
|
|
- else
|
|
|
|
|
|
+
|
|
|
|
+ p->con_rotate = initial_rotation;
|
|
|
|
+ if (p->con_rotate == -1)
|
|
|
|
+ p->con_rotate = info->fbcon_rotate_hint;
|
|
|
|
+ if (p->con_rotate == -1)
|
|
p->con_rotate = fbcon_platform_get_rotate(info);
|
|
p->con_rotate = fbcon_platform_get_rotate(info);
|
|
|
|
+
|
|
set_blitting_type(vc, info);
|
|
set_blitting_type(vc, info);
|
|
|
|
|
|
if (info->fix.type != FB_TYPE_TEXT) {
|
|
if (info->fix.type != FB_TYPE_TEXT) {
|
|
@@ -1104,10 +1107,13 @@ static void fbcon_init(struct vc_data *vc, int init)
|
|
|
|
|
|
ops = info->fbcon_par;
|
|
ops = info->fbcon_par;
|
|
ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
|
|
ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms);
|
|
- if (initial_rotation != -1)
|
|
|
|
- p->con_rotate = initial_rotation;
|
|
|
|
- else
|
|
|
|
|
|
+
|
|
|
|
+ p->con_rotate = initial_rotation;
|
|
|
|
+ if (p->con_rotate == -1)
|
|
|
|
+ p->con_rotate = info->fbcon_rotate_hint;
|
|
|
|
+ if (p->con_rotate == -1)
|
|
p->con_rotate = fbcon_platform_get_rotate(info);
|
|
p->con_rotate = fbcon_platform_get_rotate(info);
|
|
|
|
+
|
|
set_blitting_type(vc, info);
|
|
set_blitting_type(vc, info);
|
|
|
|
|
|
cols = vc->vc_cols;
|
|
cols = vc->vc_cols;
|