d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vt(4): Don't run vt_set_border() and vt_flush() concurrently

Browse Source 
In the case of vt_vga, the two concurrent calls were writing to the same
VGA registers, causing incorrect refresh of the screen.

MFC after:	1 week
This commit is contained in:
Jean-Sébastien Pédron 2014-08-22 16:30:26 +00:00
parent 1e218ce964
commit 15c6d8f590
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
sys/dev/vt/vt_core.c
View File

@ -866,13 +866,14 @@ vt_flush(struct vt_device *vd)
vw = vd->vd_curwindow;
if (vw == NULL)
return;
vf = vw->vw_font;
if (((vd->vd_flags & VDF_TEXTMODE) == 0) && (vf == NULL))
return;
if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY)
return;
vf = vw->vw_font;
if (((vd->vd_flags & VDF_TEXTMODE) == 0) && (vf == NULL))
return;
cursor_displayed = 0;
#ifndef SC_NO_CUTPASTE
@ -1210,6 +1211,35 @@ vtterm_opened(struct terminal *tm, int opened)
VT_UNLOCK(vd);
}
static int
vt_set_border(struct vt_window *vw, struct vt_font *vf, term_color_t c)
{
struct vt_device *vd = vw->vw_device;
int x, y, off_x, off_y;
if (vd->vd_driver->vd_drawrect == NULL)
return (ENOTSUP);
x = vd->vd_width - 1;
y = vd->vd_height - 1;
off_x = vw->vw_offset.tp_col;
off_y = vw->vw_offset.tp_row;
/* Top bar. */
if (off_y > 0)
vd->vd_driver->vd_drawrect(vd, 0, 0, x, off_y - 1, 1, c);
/* Left bar. */
if (off_x > 0)
vd->vd_driver->vd_drawrect(vd, 0, off_y, off_x - 1, y - off_y,
1, c);
/* Right bar. May be 1 pixel wider than necessary due to rounding. */
vd->vd_driver->vd_drawrect(vd, x - off_x, off_y, x, y - off_y, 1, c);
/* Bottom bar. May be 1 mixel taller than necessary due to rounding. */
vd->vd_driver->vd_drawrect(vd, 0, y - off_y, x, y, 1, c);
return (0);
}
static int
vt_change_font(struct vt_window *vw, struct vt_font *vf)
{
@ -1269,42 +1299,15 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
}
/* Force a full redraw the next timer tick. */
if (vd->vd_curwindow == vw)
if (vd->vd_curwindow == vw) {
vt_set_border(vw, vf, TC_BLACK);
vd->vd_flags |= VDF_INVALID;
}
vw->vw_flags &= ~VWF_BUSY;
VT_UNLOCK(vd);
return (0);
}
static int
vt_set_border(struct vt_window *vw, struct vt_font *vf, term_color_t c)
{
struct vt_device *vd = vw->vw_device;
int x, y, off_x, off_y;
if (vd->vd_driver->vd_drawrect == NULL)
return (ENOTSUP);
x = vd->vd_width - 1;
y = vd->vd_height - 1;
off_x = vw->vw_offset.tp_col;
off_y = vw->vw_offset.tp_row;
/* Top bar. */
if (off_y > 0)
vd->vd_driver->vd_drawrect(vd, 0, 0, x, off_y - 1, 1, c);
/* Left bar. */
if (off_x > 0)
vd->vd_driver->vd_drawrect(vd, 0, off_y, off_x - 1, y - off_y,
1, c);
/* Right bar. May be 1 pixel wider than necessary due to rounding. */
vd->vd_driver->vd_drawrect(vd, x - off_x, off_y, x, y - off_y, 1, c);
/* Bottom bar. May be 1 mixel taller than necessary due to rounding. */
vd->vd_driver->vd_drawrect(vd, 0, y - off_y, x, y, 1, c);
return (0);
}
static int
vt_proc_alive(struct vt_window *vw)
{
@ -1840,10 +1843,6 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
return (error);
error = vt_change_font(vw, vf);
if (error == 0) {
/* XXX: replace 0 with current bg color. */
vt_set_border(vw, vf, 0);
}
vtfont_unref(vf);
return (error);
}