Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16948
b: refs/heads/master
c: 954de91
h: refs/heads/master
v: v3
  • Loading branch information
Samuel Thibault authored and Linus Torvalds committed Jan 9, 2006
1 parent b07f034 commit f189fe9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b8b0af24353eafadf58a0889999700e43f135aad
refs/heads/master: 954de9141e75cf2f1ce69ccdbedc83ec827a01ec
8 changes: 7 additions & 1 deletion trunk/drivers/video/console/vgacon.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,16 @@ static int vgacon_doresize(struct vc_data *c,
{
unsigned long flags;
unsigned int scanlines = height * c->vc_font.height;
u8 scanlines_lo, r7, vsync_end, mode;
u8 scanlines_lo, r7, vsync_end, mode, max_scan;

spin_lock_irqsave(&vga_lock, flags);

outb_p(VGA_CRTC_MAX_SCAN, vga_video_port_reg);
max_scan = inb_p(vga_video_port_val);

if (max_scan & 0x80)
scanlines <<= 1;

outb_p(VGA_CRTC_MODE, vga_video_port_reg);
mode = inb_p(vga_video_port_val);

Expand Down

0 comments on commit f189fe9

Please sign in to comment.