Date: 15 Apr 1998 10:41:08 +0200 From: dag-erli@ifi.uio.no (Dag-Erling Coidan =?iso-8859-1?Q?Sm=F8rgrav?= ) To: hackers@FreeBSD.ORG Subject: syscons.c Message-ID: <xzp4szvwk7v.fsf@hrotti.ifi.uio.no>
next in thread | raw e-mail | index | archive | help
There was a discussion a while back (jan/feb) about graphical
screensavers and changes needed in /sys/i386/isa/syscons.s to support
them. AFAIK none of these changes have been committed. I want to
commit *one* of them (the most conservative one): slightly change the
order in which things are done in scrn_timer.c to prevent the deadlock
that arises on wakeup (syscons wants to stop the screensaver but
doesn't dare to because the console is in an unknown mode).
--- /sys/i386/isa/syscons.c.orig Sat Feb 28 06:16:14 1998
+++ /sys/i386/isa/syscons.c Wed Apr 15 10:39:51 1998
@@ -2226,19 +2226,19 @@
scintr(0);
}
- /* should we just return ? */
- if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) {
- timeout(scrn_timer, NULL, hz / 10);
- splx(s);
- return;
- }
-
/* should we stop the screen saver? */
if (panicstr)
scrn_time_stamp = mono_time.tv_sec;
if (mono_time.tv_sec <= scrn_time_stamp + scrn_blank_time)
if (scrn_blanked > 0)
stop_scrn_saver(current_saver);
+
+ /* should we just return ? */
+ if ((scp->status&UNKNOWN_MODE) || blink_in_progress || switch_in_progress) {
+ timeout(scrn_timer, NULL, hz / 10);
+ splx(s);
+ return;
+ }
scp = cur_console;
if (scrn_blanked <= 0)
--
fprintf(stderr, "I have a closed mind. It helps keeping the rain out.\n");
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzp4szvwk7v.fsf>