Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S263772AbUFRV5i (ORCPT ); Fri, 18 Jun 2004 17:57:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262882AbUFRV4L (ORCPT ); Fri, 18 Jun 2004 17:56:11 -0400 Received: from cnh51.neoplus.adsl.tpnet.pl ([83.31.161.51]:2052 "EHLO satan.blackhosts") by vger.kernel.org with ESMTP id S264527AbUFRVuK (ORCPT ); Fri, 18 Jun 2004 17:50:10 -0400 Date: Fri, 18 Jun 2004 23:50:47 +0200 From: Jakub Bogusz To: linux-kernel@vger.kernel.org, linux-fbdev-devel@lists.sourceforge.net Cc: pld-kernel@pld-linux.org Subject: 2.6.7 fbcon: set_con2fb on current console = crash Message-ID: <20040618215047.GA4723@satan.blackhosts> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-Disclaimer: speaking only for myself Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2195 Lines: 56 --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline After upgrade from 2.6.4 to 2.6.7 I noticed that calling set_con2fb (through FBIOPUT_CON2FBMAP ioctl) on current console (already attached to fb using this ioctl) causes crash (oops and then recursive oops when trying to printk on console) and makes console unusable. That's because take_over_console() calls fbcon_deinit(vc_num) (which calls fbcon_free_font() on that console display) and then fbcon_init(vc_num, ...), which copies font data from current fb console. If current console was just deinit()ed, its fontdata is NULL - and this pointer is "copied" to the same place, leaving current console with fontdata==NULL (which leads to oops on nearest putc/putcs). Attached patch restores 2.6.4 behaviour on set_con2fb (to set font if it's not set already) - but it's not perfect solution as user font is still lost (unline on 2.4.x kernels). Any idea how to preserve user font on set_con2fb() called on current console? -- Jakub Bogusz http://cyber.cs.net.pl/~qboosh/ --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="linux-fbcon-con2fb-crash-workaround.patch" --- linux-2.6.7/drivers/video/console/fbcon.c.orig 2004-06-16 18:24:04.000000000 +0200 +++ linux-2.6.7/drivers/video/console/fbcon.c 2004-06-18 23:12:35.000000000 +0200 @@ -617,6 +617,15 @@ if (p->userfont) { REFCOUNT(p->fontdata)++; charcnt = FNTCHARCNT(p->fontdata); + } else if(!p->fontdata) { + struct font_desc *font = NULL; + if (!fontname[0] || !(font = find_font(fontname))) + font = get_default_font(info->var.xres, + info->var.yres); + vc->vc_font.width = font->width; + vc->vc_font.height = font->height; + vc->vc_font.data = p->fontdata = font->data; + vc->vc_font.charcount = 256; /* FIXME Need to support more fonts */ } con_copy_unimap(vc->vc_num, display_fg); --PNTmBPCT7hxwcZjr-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/