View | Details | Raw Unified | Return to bug 302010
Collapse All | Expand All

(-)a/drivers/video/console/vgacon.c (-5 / +6 lines)
Lines 1241-1247 static int vgacon_font_set(struct vc_data *c, struct console_font *font, unsigne Link Here
1241
	unsigned charcount = font->charcount;
1241
	unsigned charcount = font->charcount;
1242
	int rc;
1242
	int rc;
1243
1243
1244
	if (vga_video_type < VIDEO_TYPE_EGAM)
1244
	if (vga_video_type < VIDEO_TYPE_EGAM || !CON_IS_VISIBLE(c))
1245
		return -EINVAL;
1245
		return -EINVAL;
1246
1246
1247
	if (font->width != VGA_FONTWIDTH ||
1247
	if (font->width != VGA_FONTWIDTH ||
Lines 1259-1265 static int vgacon_font_set(struct vc_data *c, struct console_font *font, unsigne Link Here
1259
1259
1260
static int vgacon_font_get(struct vc_data *c, struct console_font *font)
1260
static int vgacon_font_get(struct vc_data *c, struct console_font *font)
1261
{
1261
{
1262
	if (vga_video_type < VIDEO_TYPE_EGAM)
1262
	if (vga_video_type < VIDEO_TYPE_EGAM || !CON_IS_VISIBLE(c))
1263
		return -EINVAL;
1263
		return -EINVAL;
1264
1264
1265
	font->width = VGA_FONTWIDTH;
1265
	font->width = VGA_FONTWIDTH;
Lines 1293-1299 static int vgacon_resize(struct vc_data *c, unsigned int width, Link Here
1293
1293
1294
static int vgacon_set_origin(struct vc_data *c)
1294
static int vgacon_set_origin(struct vc_data *c)
1295
{
1295
{
1296
	if (vga_is_gfx ||	/* We don't play origin tricks in graphic modes */
1296
	if (!CON_IS_VISIBLE(c) ||
1297
	     vga_is_gfx ||/* We don't play origin tricks in graphic modes */
1297
	    (console_blanked && !vga_palette_blanked))	/* Nor we write to blanked screens */
1298
	    (console_blanked && !vga_palette_blanked))	/* Nor we write to blanked screens */
1298
		return 0;
1299
		return 0;
1299
	c->vc_origin = c->vc_visible_origin = vga_vram_base;
1300
	c->vc_origin = c->vc_visible_origin = vga_vram_base;
Lines 1330-1336 static int vgacon_scroll(struct vc_data *c, int t, int b, int dir, Link Here
1330
	unsigned long oldo;
1331
	unsigned long oldo;
1331
	unsigned int delta;
1332
	unsigned int delta;
1332
1333
1333
	if (t || b != c->vc_rows || vga_is_gfx || c->vc_mode != KD_TEXT)
1334
	if (t || b != c->vc_rows || vga_is_gfx || !CON_IS_VISIBLE(c)
1335
		|| c->vc_mode != KD_TEXT)
1334
		return 0;
1336
		return 0;
1335
1337
1336
	if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)
1338
	if (!vga_hardscroll_enabled || lines >= c->vc_rows / 2)
1337
- 

Return to bug 302010