From 75f71e982fcfe9f393844ad42de0e7b6531ef8d2 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 8 May 2007 00:39:54 -0700 Subject: [PATCH] --- yaml --- r: 54961 b: refs/heads/master c: 167f07f1bc20ea1ab51d833deb0c18f5ab93618f h: refs/heads/master i: 54959: 31da0de87053f119e2398f5aae24d20565ddc6fd v: v3 --- [refs] | 2 +- trunk/drivers/video/console/fbcon.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1f9420eeb85a..80646302c3f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1e7223f28b4ed5073d2029a3597bf514ff514f2 +refs/heads/master: 167f07f1bc20ea1ab51d833deb0c18f5ab93618f diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c index 34899bd7c9f3..73813c60d03a 100644 --- a/trunk/drivers/video/console/fbcon.c +++ b/trunk/drivers/video/console/fbcon.c @@ -3048,14 +3048,14 @@ static void fbcon_get_requirement(struct fb_info *info, { struct vc_data *vc; struct display *p; - int charcnt; if (caps->flags) { - int i; + int i, charcnt; for (i = first_fb_vc; i <= last_fb_vc; i++) { vc = vc_cons[i].d; - if (vc && vc->vc_mode == KD_TEXT) { + if (vc && vc->vc_mode == KD_TEXT && + info->node == con2fb_map[i]) { p = &fb_display[i]; caps->x |= 1 << (vc->vc_font.width - 1); caps->y |= 1 << (vc->vc_font.height - 1); @@ -3068,14 +3068,13 @@ static void fbcon_get_requirement(struct fb_info *info, } else { vc = vc_cons[fg_console].d; - if (vc && vc->vc_mode == KD_TEXT) { + if (vc && vc->vc_mode == KD_TEXT && + info->node == con2fb_map[fg_console]) { p = &fb_display[fg_console]; - caps->x |= 1 << (vc->vc_font.width - 1); - caps->y |= 1 << (vc->vc_font.height - 1); - charcnt = (p->userfont) ? + caps->x = 1 << (vc->vc_font.width - 1); + caps->y = 1 << (vc->vc_font.height - 1); + caps->len = (p->userfont) ? FNTCHARCNT(p->fontdata) : 256; - if (caps->len < charcnt) - caps->len = charcnt; } } }