Date: Mon, 17 Jun 2013 22:37:26 +0300 From: Konstantin Belousov <kostikbel@gmail.com> To: Michiel Boland <boland37@xs4all.nl> Cc: FreeBSD Stable <freebsd-stable@freebsd.org> Subject: Re: system sporadically hangs on shutdown after switching to WITH_NEW_XORG Message-ID: <20130617193726.GR91021@kib.kiev.ua> In-Reply-To: <51BF60A8.6000503@xs4all.nl> References: <51BDD593.5000102@xs4all.nl> <51BF60A8.6000503@xs4all.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, Jun 17, 2013 at 09:16:56PM +0200, Michiel Boland wrote:
> On 06/16/2013 17:11, Michiel Boland wrote:
> > Hi. Recently I switched to WITH_NEW_XORG, primarily because the stock X server
> > with Intel driver has some issues that make it unusable for me.
> >
> > The new X server and Intel driver works extremely well, so kudos to whoever made
> > this possible.
> >
> > Unfortunately, I am now experiencing random hangs on shutdown. On shutdown the
> > system randomly freezes after
> >
> > [...] syslogd: exiting on signal 15
> >
> > I would then expect to see 'Waiting (max 60 seconds) for system process 'XXX' to
> > stop messages, but these never arrive.
>
> So it turns out that init hangs because vga_txtmouse (draw_txtmouse in fact) is
> hogging the clock swi. The routine is waiting for a vertical retrace which never
> arrives. (The new intel driver can't return to text console, so the screen just
> goes blank when X exits.)
>
> Some workarounds:
>
> - don't run moused (i.e. disable it in rc.conf and devd.conf)
> instead run the X server in combination with hald
>
> - do run moused, but then either
>
> - unplug the mouse before shutting down
>
> - build a kernel with VGA_NO_FONT_LOADING
>
> Of course the long-term fix is to remove the possibly infinite loop in
> draw_txtmouse.
>
> Thanks to Konstantin for his patience in helping me track this down.
The following patch, although a hack, should fix the issue.
Michiel tested it.
diff --git a/sys/dev/drm2/i915/intel_fb.c b/sys/dev/drm2/i915/intel_fb.c
index 3cb3b78..e41a49f 100644
--- a/sys/dev/drm2/i915/intel_fb.c
+++ b/sys/dev/drm2/i915/intel_fb.c
@@ -207,6 +207,8 @@ static void intel_fbdev_destroy(struct drm_device *dev,
}
}
+extern int sc_txtmouse_no_retrace_wait;
+
int intel_fbdev_init(struct drm_device *dev)
{
struct intel_fbdev *ifbdev;
@@ -229,6 +231,7 @@ int intel_fbdev_init(struct drm_device *dev)
drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
drm_fb_helper_initial_config(&ifbdev->helper, 32);
+ sc_txtmouse_no_retrace_wait = 1;
return 0;
}
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 6e6663c..fc7f02f 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -395,6 +395,8 @@ vga_txtblink(scr_stat *scp, int at, int flip)
{
}
+int sc_txtmouse_no_retrace_wait;
+
#ifndef SC_NO_CUTPASTE
static void
@@ -445,7 +447,9 @@ draw_txtmouse(scr_stat *scp, int x, int y)
#if 1
/* wait for vertical retrace to avoid jitter on some videocards */
crtc_addr = scp->sc->adp->va_crtc_addr;
- while (!(inb(crtc_addr + 6) & 0x08)) /* idle */ ;
+ while (!sc_txtmouse_no_retrace_wait &&
+ !(inb(crtc_addr + 6) & 0x08))
+ /* idle */ ;
#endif
c = scp->sc->mouse_char;
vidd_load_font(scp->sc->adp, 0, 32, 8, font_buf, c, 4);
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (FreeBSD)
iQIcBAEBAgAGBQJRv2V2AAoJEJDCuSvBvK1BnoYP/jpuSewCk+00USw6beL6CquJ
/0Eug9CHqR2UTp+Yzc16acLYLLHMzHub3aAPErZg5SBm1YbciCHA4/5AGiAf8G0V
hoouxWW8yki2MgGNeq5Op3sIjVHZBSuXYPIOOHi9clVhcHj0QLsX9ii0LTmlste+
Fa8KQyIjXAqQb/5YU5BuqNExagVmtm7FHxNtrcrqFnEZ1lNds8NoUxPP3roXCkx3
C4GtAanXk6e6Lx+ChuN8T66kXCyR89B05i5Vb4CToko2oc1WPvjgBxLguv5kMis6
NAGJZlwE0WoYkB9KGnqbg4kk12jih9JPe1rBw9hypg5gYoeNdaqqNHpQgl007wWu
xYQMgXnXxR4lwfQKqGjGMlCUsYo/XlYlaxbo8o1213GxHqMX16gYaKR3VZFYmdAZ
cauwsFZ7koUpgF6EfNHh4U3kHPqQlRle8P4rMV4ug++u9DanUjyRKMU8K7YC9nX7
kjMhzDrflM8iAHqQqOW4QCJ29bvt3nzu+u5DknPagU6VB3P7TKvDGz8FdqJWpDlk
ts65MP5uEtX0zRw5l1EXGWZxMN09sVETtaRf1OiIi3ktuJwUD8RA1eOyVhIGWzro
ZYS8hjNuLSO5I73z86w7XoRZvbW0eeeq3XyAPq63Cig5K5KDLSOsHF7DlvEOp2Fy
bhissJ6cJUO7y6kw/T6Q
=8GIf
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130617193726.GR91021>