Commit 10732c35 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

fbcon: fix wrong vmode bits copied on console switch

The interlaced and double line mode bits should not be copied to new
console when the console is switched.  Otherwise, the new console may be
set to incorrect refresh rate.

Also, the x and y offsets does not need to be copied.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dba6a4d3
...@@ -2275,9 +2275,7 @@ static int fbcon_switch(struct vc_data *vc) ...@@ -2275,9 +2275,7 @@ static int fbcon_switch(struct vc_data *vc)
* in fb_set_var() * in fb_set_var()
*/ */
info->var.activate = var.activate; info->var.activate = var.activate;
var.yoffset = info->var.yoffset; var.vmode |= info->var.vmode & ~FB_VMODE_MASK;
var.xoffset = info->var.xoffset;
var.vmode = info->var.vmode;
fb_set_var(info, &var); fb_set_var(info, &var);
ops->var = info->var; ops->var = info->var;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment