summaryrefslogtreecommitdiff
path: root/drivers/video/console/fbcon_ccw.c
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2014-09-16 12:40:26 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-09-30 13:39:16 +0300
commitf74a289b9480648a654e5afd8458c2263c03a1e1 (patch)
tree80f1316690a2137b7461e7648039c27e3b1f5390 /drivers/video/console/fbcon_ccw.c
parentc8b8888f097c7df260cf5beaf2e3a325660a16a4 (diff)
downloadlwn-f74a289b9480648a654e5afd8458c2263c03a1e1.tar.gz
lwn-f74a289b9480648a654e5afd8458c2263c03a1e1.zip
framebuffer: fix border color
The framebuffer code uses the current background color to fill the border when switching consoles, however, this results in inconsistent behavior. For example: - start Midnigh Commander - the border is black - switch to another console and switch back - the border is cyan - type something into the command line in mc - the border is cyan - switch to another console and switch back - the border is black - press F9 to go to menu - the border is black - switch to another console and switch back - the border is dark blue When switching to a console with Midnight Commander, the border is random color that was left selected by the slang subsystem. This patch fixes this inconsistency by always using black as the background color when switching consoles. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/console/fbcon_ccw.c')
-rw-r--r--drivers/video/console/fbcon_ccw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c
index 41b32ae23dac..5a3cbf6dff4d 100644
--- a/drivers/video/console/fbcon_ccw.c
+++ b/drivers/video/console/fbcon_ccw.c
@@ -197,9 +197,8 @@ static void ccw_clear_margins(struct vc_data *vc, struct fb_info *info,
unsigned int bh = info->var.xres - (vc->vc_rows*ch);
unsigned int bs = vc->vc_rows*ch;
struct fb_fillrect region;
- int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
- region.color = attr_bgcol_ec(bgshift,vc,info);
+ region.color = 0;
region.rop = ROP_COPY;
if (rw && !bottom_only) {