From 131b414feb2ecabe31b538d65725ac4427a4387a Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Wed, 21 Jan 2009 09:01:05 -0800
Subject: [PATCH] Tear down batchbuffers unconditionally on LeaveVT

Even if KMS is enabled we should do this, to avoid running batches that
depend on other state we tear down in LeaveVT.
---
 src/i830_driver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 7b66a539..4a9b9d05 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3581,7 +3581,6 @@ I830LeaveVT(int scrnIndex, int flags)
 	*/
        if (!pI830->memory_manager)
 	   intel_bufmgr_fake_evict_all(pI830->bufmgr);
-       intel_batch_teardown(pScrn);
 
        if (!pI830->memory_manager)
 	   i830_stop_ring(pScrn, TRUE);
@@ -3592,6 +3591,8 @@ I830LeaveVT(int scrnIndex, int flags)
        }
    }
 
+   intel_batch_teardown(pScrn);
+
    if (I830IsPrimary(pScrn))
       i830_unbind_all_memory(pScrn);