Message ID | 1312799864-3468-1-git-send-email-FlorianSchandinat@gmx.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hello Florian, > This patch allows having multiple visible consoles that receive > display updates. For example one can have running "top" to monitor > the system on fb0 and at the same time work on a shell on fb1. I hate to report this, because I would really appreciate this feature, but your patch (applied against kernel 3.0) breaks my machine. I have an x86-64 machine with a dual-GPU ATI Radeon HD 4850 X2 (which acts essentially as two discrete R700s) driven by the "radeon" KMS driver. If I use the "fbcon=map:01" boot option to map the even-numbered VCs to the first GPU and the odd-numbered VCs to the second GPU, the kernel patched with your patch encounters some sort of soft-lockup when initializing the second GPU (i.e. creating the fb1) while booting. The is no panic or oops message and I can reset the machine by hitting ctrl+alt+del, but there is no further progress. I can provide further observations if you would like to. Best regards Martin Decky -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello Martin, On 08/11/2011 10:57 AM, Martin Decky wrote: > Hello Florian, > >> This patch allows having multiple visible consoles that receive >> display updates. For example one can have running "top" to monitor >> the system on fb0 and at the same time work on a shell on fb1. > > I hate to report this, because I would really appreciate this feature, > but your patch (applied against kernel 3.0) breaks my machine. Thank you for testing it. And you do not need to worry, the more feedback I get the more motivated I am to get it mainline. > I have an x86-64 machine with a dual-GPU ATI Radeon HD 4850 X2 (which > acts essentially as two discrete R700s) driven by the "radeon" KMS driver. > > If I use the "fbcon=map:01" boot option to map the even-numbered VCs to > the first GPU and the odd-numbered VCs to the second GPU, the kernel > patched with your patch encounters some sort of soft-lockup when > initializing the second GPU (i.e. creating the fb1) while booting. The > is no panic or oops message and I can reset the machine by hitting > ctrl+alt+del, but there is no further progress. I can provide further > observations if you would like to. Interesting. With your fbcon option I was able to reproduce it (without it, it boots as expected). Unfortunately I was not yet able too figure out what causes this behavior. I guess it'll take me some time to get it right, probably not for the next merge window, but I'll continue to work on it. Thanks, Florian Tobias Schandinat -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 8745637..5246a15 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -710,8 +710,11 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, if (!err) { info->fbcon_par = ops; - if (vc) + if (vc) { + ops->vc_fg = vc; + vc->vc_display_fg = &ops->vc_fg; set_blitting_type(vc, info); + } } if (err) { @@ -814,6 +817,7 @@ static int set_con2fb_map(int unit, int newidx, int user) { struct vc_data *vc = vc_cons[unit].d; int oldidx = con2fb_map[unit]; + struct fbcon_ops *ops; struct fb_info *info = registered_fb[newidx]; struct fb_info *oldinfo = NULL; int found, err = 0; @@ -839,6 +843,11 @@ static int set_con2fb_map(int unit, int newidx, int user) if (!err && !found) err = con2fb_acquire_newinfo(vc, info, unit, oldidx); + if (!err && oldinfo) { + ops = oldinfo->fbcon_par; + if (vc == ops->vc_fg) + ops->vc_fg = NULL; + } /* * If old fb is not mapped to any of the consoles, @@ -849,6 +858,8 @@ static int set_con2fb_map(int unit, int newidx, int user) found); if (!err) { + ops = info->fbcon_par; + vc->vc_display_fg = &ops->vc_fg; int show_logo = (fg_console == 0 && !user && logo_shown != FBCON_LOGO_DONTSHOW); diff --git a/drivers/video/console/fbcon.h b/drivers/video/console/fbcon.h index 6bd2e0c..adc7316 100644 --- a/drivers/video/console/fbcon.h +++ b/drivers/video/console/fbcon.h @@ -69,6 +69,7 @@ struct fbcon_ops { struct timer_list cursor_timer; /* Cursor timer */ struct fb_cursor cursor_state; struct display *p; + struct vc_data *vc_fg; int currcon; /* Current VC. */ int cursor_flash; int cursor_reset;
This patch allows having multiple visible consoles that receive display updates. For example one can have running "top" to monitor the system on fb0 and at the same time work on a shell on fb1. At the moment that works only with consoles, not with console and graphical application nor with two graphical applications. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> --- drivers/video/console/fbcon.c | 13 ++++++++++++- drivers/video/console/fbcon.h | 1 + 2 files changed, 13 insertions(+), 1 deletions(-) There are probably still some bugs in this and it requires a lot of review and testing before it ready for inclusion. I just want to know whether it looks good and whether the approach taken (it's my 3rd) is acceptable. I think the feature is desirable and I hope that we can avoid the limitation to consoles only one day. The problem that causes it is that the vt.c has a global blanking variable it sets as soon as any graphical application starts and hence no console updates go through anymore.