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

Do not attempt to switch to the same VTs between suspend and resume.

Browse Source
This commit is contained in:
Jung-uk Kim 2010-05-26 16:37:54 +00:00
parent b2318c2860
commit 55e1b13327
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/isa/syscons_isa.c
View File

@ -119,14 +119,15 @@ scsuspend(device_t dev)
if (sc->cur_scp == NULL)
return (0);
if (sc->suspend_in_progress == 0 && !sc_no_suspend_vtswitch) {
if (sc->suspend_in_progress == 0) {
sc_cur_scr = sc->cur_scp->index;
do {
sc_switch_scr(sc, 0);
if (!sc->switch_in_progress)
break;
pause("scsuspend", hz);
} while (retry--);
if (!sc_no_suspend_vtswitch && sc_cur_scr != 0)
do {
sc_switch_scr(sc, 0);
if (!sc->switch_in_progress)
break;
pause("scsuspend", hz);
} while (retry--);
}
sc->suspend_in_progress++;
@ -141,8 +142,9 @@ scresume(device_t dev)
sc = &main_softc;
sc->suspend_in_progress--;
if (sc->suspend_in_progress == 0 && !sc_no_suspend_vtswitch)
sc_switch_scr(sc, sc_cur_scr);
if (sc->suspend_in_progress == 0)
if (!sc_no_suspend_vtswitch && sc_cur_scr != 0)
sc_switch_scr(sc, sc_cur_scr);
return (0);
}