tty: Fix order of VT ack/release ioctls and the vt handler

We can only set up once we've acquired the VT and we shouldn't release the
VT until we've cleaned up.  Before we would release the VT first, and then
race to drop drm master as X tried to get drm master.  Which would kill X.

diff --git a/src/tty.c b/src/tty.c
index f583eb5..7b68ff1 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -49,10 +49,10 @@ static int on_enter_vt(int signal_number, void *data)
 {
        struct tty *tty = data;
 
-       tty->vt_func(tty->compositor, TTY_ENTER_VT);
-
        ioctl(tty->fd, VT_RELDISP, VT_ACKACQ);
 
+       tty->vt_func(tty->compositor, TTY_ENTER_VT);
+
        return 1;
 }
 
@@ -61,10 +61,10 @@ on_leave_vt(int signal_number, void *data)
 {
        struct tty *tty = data;
 
-       ioctl(tty->fd, VT_RELDISP, 1);
-
        tty->vt_func(tty->compositor, TTY_LEAVE_VT);
 
+       ioctl(tty->fd, VT_RELDISP, 1);
+
        return 1;
 }