From: Knut Petersen Date: Sat, 7 Jan 2006 09:22:04 +0000 (+0100) Subject: [PATCH] fbcon: don´t call set_par() in fbcon_init() if vc_mode == KD_GRAPHICS X-Git-Tag: v2.6.16-rc1~932 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d354d9afe923eb08f7ee89128b38ddb6415de01d;p=linux-2.6 [PATCH] fbcon: don´t call set_par() in fbcon_init() if vc_mode == KD_GRAPHICS Nothing prevents a user to modprobe a framebuffer driver from e.g. the xterm prompt. As a result, the set_par() function of the driver will be called from fbcon_init(). This is fatal as a lot of X / framebuffer combinations are unable to recover from set_par() reprogramming the graphics controller in KD_GRAPHICS mode. It is also unnecessary as the set_par() function will be called during a switch to KD_TEXT anyway. Because of this no side effects are possible. Signed-off-by: Knut Petersen Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 3660e51b26..50e4c4eb49 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -1110,7 +1110,7 @@ static void fbcon_init(struct vc_data *vc, int init) * * We need to do it in fbcon_init() to prevent screen corruption. */ - if (CON_IS_VISIBLE(vc)) { + if (CON_IS_VISIBLE(vc) && vc->vc_mode == KD_TEXT) { if (info->fbops->fb_set_par && !(ops->flags & FBCON_FLAGS_INIT)) info->fbops->fb_set_par(info);