NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

egl/wayland: Fix possible lockup in drm initialization

Browse source 
Lockup happens when wl_drm interface is not available.
This commit is contained in:
Benjamin Franzke 2011-04-29 17:04:11 +02:00
parent 8a58eccc62
commit dc520d4fef
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/egl/drivers/dri2/platform_wayland.c
View file

@ -680,7 +680,7 @@ dri2_initialize_wayland(_EGLDriver *drv, _EGLDisplay *disp)
id = wl_display_get_global(dri2_dpy->wl_dpy, "wl_drm", 1);
if (id == 0)
wl_display_iterate(dri2_dpy->wl_dpy, WL_DISPLAY_READABLE);
force_roundtrip(dri2_dpy->wl_dpy);
id = wl_display_get_global(dri2_dpy->wl_dpy, "wl_drm", 1);
if (id == 0)
goto cleanup_dpy;

2
src/gallium/state_trackers/egl/wayland/native_drm.c
View file

@ -205,7 +205,7 @@ wayland_drm_display_init_screen(struct native_display *ndpy)
id = wl_display_get_global(drmdpy->base.dpy, "wl_drm", 1);
if (id == 0)
wl_display_iterate(drmdpy->base.dpy, WL_DISPLAY_READABLE);
force_roundtrip(drmdpy->base.dpy);
id = wl_display_get_global(drmdpy->base.dpy, "wl_drm", 1);
if (id == 0)
return FALSE;