From: Philipp Brüschweiler <blei42@gmail.com>
Date: Wed, 15 Aug 2012 16:14:44 +0000 (+0200)
Subject: wayland-drm: close fd after the display is uninitialized
X-Git-Tag: mesa-9.0~461
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0efd564a09988a4a7f49cab70b778026459dff1b;p=platform%2Fupstream%2Fmesa.git

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 <krh@bitplanet.net>
---

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);
 }