Module: Mesa Branch: master Commit: 0efd564a09988a4a7f49cab70b778026459dff1b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0efd564a09988a4a7f49cab70b778026459dff1b
Author: Philipp Brüschweiler <[email protected]> Date: Wed Aug 15 18:14:44 2012 +0200 wayland-drm: close fd after the display is uninitialized This fixes a "kernel rejected pushbuf: Bad file descriptor" error on wl_drm display destruction. Reviewed-by: Kristian Høgsberg <[email protected]> --- .../state_trackers/egl/wayland/native_drm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/egl/wayland/native_drm.c b/src/gallium/state_trackers/egl/wayland/native_drm.c index 006b3d5..c6f6197 100644 --- a/src/gallium/state_trackers/egl/wayland/native_drm.c +++ b/src/gallium/state_trackers/egl/wayland/native_drm.c @@ -71,8 +71,6 @@ wayland_drm_display_destroy(struct native_display *ndpy) { struct wayland_drm_display *drmdpy = wayland_drm_display(ndpy); - if (drmdpy->fd) - close(drmdpy->fd); if (drmdpy->wl_drm) wl_drm_destroy(drmdpy->wl_drm); if (drmdpy->device_name) @@ -84,6 +82,9 @@ wayland_drm_display_destroy(struct native_display *ndpy) ndpy_uninit(ndpy); + if (drmdpy->fd) + close(drmdpy->fd); + FREE(drmdpy); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
