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: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt 2008-06-05 22:46:33 -07:00 committed by Linus Torvalds
parent dba6a4d32d
commit 10732c35df

View File

@ -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;