frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
xserver/hw/xwayland
History
Olivier Fourdan 6a6bbc3b75 xwayland: Restore wl_display_roundtrip() in InitInput 
This partially revert commit 984be78

The rountrip in Xwayland's InitInput() is unlikely the culprit for the
crash reported in bug 95337, even though it's triggered from
InitInput().

Startup goes like this:

  xwl_screen_init()
    xwl_output_create()
    wl_display_roundtrip()
  InitInput()
    wl_display_roundtrip()
  ConnectionInfo initialized

What happens in bug 95337 is that some output data is already available
when we reach InitInput()'s wl_display_roundtrip() and therefore we end
up trying to update the ConnectionInfo's data from RR routines before
ConnectionInfo is actually initialized.

Removing the wl_display_roundtrip() from InitInput() will not fix the
issue (although it would make it less lileky to happen), because
xwl_screen_init() also does a wl_display_roundtrip() after creating the
output, so the race that led to bug 95337 remains.

However, re-setting the xwl_screen->expecting_event to 0 again in
InitInput() still doesn't seem right. so this part is not restored
(thus a partial revert).

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
 		2016-06-13 16:05:00 -04:00
..
.gitignore Xwayland DDX 2014-04-03 15:19:22 -07:00
Makefile.am xwayland: add glamor Xv adaptor 2016-03-09 14:03:03 -05:00
drm.xml xwayland: Add glamor and DRI3 support 2014-06-24 15:09:55 -07:00
xwayland-cursor.c xwayland: call through to miPointerWarpCursor on warp_cursor 2015-09-18 14:55:00 +02:00
xwayland-cvt.c xwayland: do not include frequency in mode name 2016-03-28 14:09:09 -04:00
xwayland-glamor-xv.c xwayland: Fix compiler warning in GLAMOR Xv 2016-04-15 16:22:16 -04:00
xwayland-glamor.c xwayland: Call eglBindAPI after eglInitialize 2016-06-08 11:51:21 -04:00
xwayland-input.c xwayland: Restore wl_display_roundtrip() in InitInput 2016-06-13 16:05:00 -04:00
xwayland-output.c xwayland: fix a crash on output removal 2016-03-01 09:56:31 -05:00
xwayland-shm.c xwayland-shm: fortify fallocate against EINTR 2016-04-25 15:29:40 -04:00
xwayland-vidmode.c xwayland: Pretend we support viewport in vidmode 2016-03-28 14:10:59 -04:00
xwayland.c xwayland: sync event queue to check compositor reply 2016-06-03 09:44:09 +02:00
xwayland.h wayland: Remove unused field in xwl_screen 2016-06-08 13:11:45 -04:00