Attachment 158947 Details for Bug 302010

[patch] patch 002

0002-Fix-setfont-calls-causing-X-corruption.patch (text/plain), 2.26 KB, created by Dirk Mueller on 2007-08-22 09:43:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Mueller

Created: 2007-08-22 09:43:37 UTC

Size: 2.26 KB

patch

obsolete

>From 43c4f878fc45e15b9a9a7896a2a7d0d67ca4caa1 Mon Sep 17 00:00:00 2001
>From: Dirk Mueller <dmueller@suse.de>
>Date: Wed, 22 Aug 2007 11:31:44 +0200
>Subject: [PATCH] Fix setfont calls causing X corruption
>
>the EGA/VGA console font loading code checked if the virtual terminal
>is not in graphics mode already. However, that is not enough, as the
>virtual terminal the font is supposed to be set on could be in the
>background right now. It shouldn`t poke with the VGA card state then
>at all as it badly interfers with the X server.
>---
> drivers/video/console/vgacon.c |   10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
>index d18b73a..c804540 100644
>--- a/drivers/video/console/vgacon.c
>+++ b/drivers/video/console/vgacon.c
>@@ -1241,7 +1241,7 @@ static int vgacon_font_set(struct vc_data *c, struct console_font *font, unsigne
> 	unsigned charcount = font->charcount;
> 	int rc;
> 
>-	if (vga_video_type < VIDEO_TYPE_EGAM)
>+	if (vga_video_type < VIDEO_TYPE_EGAM || !CON_IS_VISIBLE(c))
> 		return -EINVAL;
> 
> 	if (font->width != VGA_FONTWIDTH ||
>@@ -1259,7 +1259,7 @@ static int vgacon_font_set(struct vc_data *c, struct console_font *font, unsigne
> 
> static int vgacon_font_get(struct vc_data *c, struct console_font *font)
> {
>-	if (vga_video_type < VIDEO_TYPE_EGAM)
>+	if (vga_video_type < VIDEO_TYPE_EGAM || !CON_IS_VISIBLE(c))
> 		return -EINVAL;
> 
> 	font->width = VGA_FONTWIDTH;
>@@ -1293,7 +1293,8 @@ static int vgacon_resize(struct vc_data *c, unsigned int width,
> 
> static int vgacon_set_origin(struct vc_data *c)
> {
>-	if (vga_is_gfx ||	/* We don't play origin tricks in graphic modes */
>+	if (!CON_IS_VISIBLE(c) ||
>+	     vga_is_gfx ||/* We don't play origin tricks in graphic modes */
> 	    (console_blanked && !vga_palette_blanked))	/* Nor we write to blanked screens */
> 		return 0;
> 	c->vc_origin = c->vc_visible_origin = vga_vram_base;
>@@ -1330,7 +1331,8 @@ static int vgacon_scroll(struct vc_data *c, int t, int b, int dir,
> 	unsigned long oldo;
> 	unsigned int delta;
> 
>-	if (t || b != c->vc_rows || vga_is_gfx || c->vc_mode != KD_TEXT)
>+	if (t || b != c->vc_rows || vga_is_gfx || !CON_IS_VISIBLE(c)
>+		|| c->vc_mode != KD_TEXT)
> 		return 0;
> 
> 	if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)
>-- 
>1.5.2.4
>

Actions: View | Diff

Attachments on bug 302010: 158818 | 158819 | 158945 | 158947 | 158948 | 159682