diff options
author | Olivier Fourdan <ofourdan@redhat.com> | 2016-05-12 14:51:51 +0200 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2016-06-13 16:05:00 -0400 |
commit | 6a6bbc3b756706bdade01434f1ee8d8cbe7dd854 (patch) | |
tree | 15f52a205db7c258e30f40456415afa11ec2a89a /randr | |
parent | 6cb34816afa95d9214199c363f9b4bb5ecbae77b (diff) |
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
Diffstat (limited to 'randr')
0 files changed, 0 insertions, 0 deletions