xf86-video-intel: src/intel_display.c src/sna/sna_accel.c

[Chris Wilson]

 src/intel_display.c |    4 ++++
 src/sna/sna_accel.c |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 0a9b136ec43c860e6e6e651efea0330ac36a4ea5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Mar 25 15:34:41 2013 +0000

    Remove the GeneralSocket upon CloseScreen
    
    Be neat and tidy in case we are shutdown but the server is not
    regenerated (e.g. a hot-unplug).
    
    Reported-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_display.c b/src/intel_display.c
index 2197183..17168e5 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1911,6 +1911,10 @@ intel_mode_close(intel_screen_private *intel)
 
 	while (has_pending_events(mode->fd))
 		drmHandleEvent(mode->fd, &mode->event_context);
+
+	RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA,
+				     drm_wakeup_handler, mode);
+	RemoveGeneralSocket(mode->fd);
 }
 
 void
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index fd301c7..9bc6fe3 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -14377,6 +14377,7 @@ void sna_accel_close(struct sna *sna)
 	}
 
 	DeleteCallback(&FlushCallback, sna_accel_flush_callback, sna);
+	RemoveGeneralSocket(sna->kgem.fd);
 
 	kgem_cleanup_cache(&sna->kgem);
 }