summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2009-01-21 09:01:05 -0800
committerEric Anholt <eric@anholt.net>2009-01-21 11:50:11 -0800
commit11c23dd22a737aaa52ef18cd65164da9c5115d3f (patch)
tree1207edf21bc7f3b71640cda00b34294c2802ef03 /src/i830_driver.c
parentf519da8ba21ef27b4a2ed4516336b25c6feb824e (diff)
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. (cherry picked from commit 131b414feb2ecabe31b538d65725ac4427a4387a)
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 70d660af..247425c1 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3559,7 +3559,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);
@@ -3570,6 +3569,8 @@ I830LeaveVT(int scrnIndex, int flags)
}
}
+ intel_batch_teardown(pScrn);
+
if (I830IsPrimary(pScrn))
i830_unbind_all_memory(pScrn);