From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Get console sem on fbdev ioctls Date: Tue, 06 Jan 2004 11:32:43 +1100 Sender: linux-fbdev-devel-admin@lists.sourceforge.net Message-ID: <1073349163.781.172.camel@gaston> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.11] helo=sc8-sf-mx1.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.24) id 1AdfAc-0006pS-PX for linux-fbdev-devel@lists.sourceforge.net; Mon, 05 Jan 2004 16:34:06 -0800 Received: from pentafluge.infradead.org ([213.86.99.235]) by sc8-sf-mx1.sourceforge.net with esmtp (TLSv1:AES256-SHA:256) (Exim 4.30) id 1AdfAc-0006pe-0Z for linux-fbdev-devel@lists.sourceforge.net; Mon, 05 Jan 2004 16:34:06 -0800 Errors-To: linux-fbdev-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: List-Post: List-Help: List-Subscribe: , List-Archive: Content-Type: text/plain; charset="us-ascii" To: James Simmons Cc: Linux Fbdev development list Along with my VT race fixes I sent earlier, this is a patch (that may need to be applied manually, I hacked the patch file a bit since my tree is so different from yours at this point). It takes the console semaphore on userland initiated mode change, pan display, ... ioctls. Maybe more are required... This is the basics for at least fbset operations to be "safe" (vs. printk/blanking and vs. the console resize code). Note that with that and the VT fixes, I can properly now call vc_resize instead of fbcon_resize in fbcon when getting a mode changed callback, and that works really better. I basically do that if cols and rows are seen to have changed: vc_resize(vc->vc_num, cols, rows); if (CON_IS_VISIBLE(vc)) { accel_clear_margins(vc, info, 0); update_screen(vc->vc_num); } Though for stty to work fine, I also had to do proper mode selection/validation for which I added this FB_ACTIVATE_FIND option (see my other email on the subject) along with proper support in radeonfb. diff -urN linux-2.5/drivers/video/fbmem.c linuxppc-2.5-benh/drivers/video/fbmem.c --- linux-2.5/drivers/video/fbmem.c 2004-01-06 10:05:18.708660576 +1100 +++ linuxppc-2.5-benh/drivers/video/fbmem.c 2003-12-31 12:38:25.000000000 +1100 @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef CONFIG_KMOD #include #endif @@ -984,7 +995,9 @@ case FBIOPUT_VSCREENINFO: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; + acquire_console_sem(); i = fb_set_var(info, &var); + release_console_sem(); if (i) return i; if (copy_to_user((void *) arg, &var, sizeof(var))) return -EFAULT; @@ -1003,7 +1016,10 @@ case FBIOPAN_DISPLAY: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; - if ((i = fb_pan_display(info, &var))) + acquire_console_sem(); + i = fb_pan_display(info, &var); + release_console_sem(); + if (i) return i; if (copy_to_user((void *) arg, &var, sizeof(var))) return -EFAULT; @@ -1039,7 +1055,10 @@ return 0; #endif /* CONFIG_FRAMEBUFFER_CONSOLE */ case FBIOBLANK: - return fb_blank(info, arg); + acquire_console_sem(); + i = fb_blank(info, arg); + release_console_sem(); + return i; default: if (fb->fb_ioctl == NULL) return -EINVAL; -- Benjamin Herrenschmidt ------------------------------------------------------- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click