From 9600e4a0b57693da451f3f5ca61637d0275c3836 Mon Sep 17 00:00:00 2001
From: Søren Sandmann Pedersen <ssp@redhat.com>
Date: Wed, 5 Oct 2011 12:27:27 -0400
Subject: Reset non-primary device out of CloseScreen().

Otherwise, client windows will linger even after the server shuts
down. Don't reset the primary device so that we can preserve the fonts
etc.
---
 src/qxl_driver.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index d4b5a8f..5dec522 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -495,11 +495,13 @@ qxl_close_screen(int scrnIndex, ScreenPtr pScreen)
     pScreen->CreateScreenResources = qxl->create_screen_resources;
     pScreen->CloseScreen = qxl->close_screen;
     
-    
-
     result = pScreen->CloseScreen(scrnIndex, pScreen);
 
-    if (pScrn->vtSema) {
+    if (!xf86IsPrimaryPci (qxl->pci) && qxl->primary)
+       qxl_reset (qxl);
+    
+    if (pScrn->vtSema)
+    {
         qxl_restore_state(pScrn);
 	qxl_unmap_memory(qxl, scrnIndex);
     }
-- 
cgit v1.2.3