From 4291f24abdcea5cc70acf144ce90cac2dd079cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= <thomas@tungstengraphics.com>
Date: Thu, 2 Mar 2006 11:41:28 +0000
Subject: [PATCH] Add a define NO_TTM to disable ttm usage altogether for
 comparison. Reinstate MI_FLUSH at end of batchbuffers.

---
 src/mesa/drivers/dri/i915/bufmgr_fake.c       | 11 +++++++++++
 src/mesa/drivers/dri/i915/intel_batchbuffer.c |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/bufmgr_fake.c b/src/mesa/drivers/dri/i915/bufmgr_fake.c
index b0ae06f6988..1f0f910b9f3 100644
--- a/src/mesa/drivers/dri/i915/bufmgr_fake.c
+++ b/src/mesa/drivers/dri/i915/bufmgr_fake.c
@@ -28,6 +28,8 @@ static int ttmcount = 0;
  * Backdoor mapping will very probably fix this. (texdown-pool)
  */ 
 
+#define NO_TTM
+
 #undef CACHED_TTMS
 
 /*
@@ -42,6 +44,11 @@ static int ttmcount = 0;
 
 #define BATCH_LOCATION 1
 
+#ifdef NO_TTM
+#undef BATCH_LOCATION
+#define BATCH_LOCATION 0
+#endif
+
 #if (BATCH_LOCATION == 2)
 #warning Batch buffers using dynamic TTMS. Making TTMS uncached.
 #undef CACHED_TTMS
@@ -166,6 +173,10 @@ static struct block *alloc_block( struct bufmgr *bm,
     int ret;
     struct block *block;
     unsigned alignment = ( 1 << align );
+
+#ifdef NO_TTM
+    flags |= BM_NO_TTM;
+#endif
     
     if (!(flags & BM_NO_TTM) 
 #if (BATCH_LOCATION != 2)
diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
index 22b595639aa..09f7edfdf75 100644
--- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c
@@ -194,13 +194,13 @@ GLuint intel_batchbuffer_flush( struct intel_batchbuffer *batch )
     * performance drain that we would like to avoid.
     */
    if (used & 4) {
-     ((int *)batch->ptr)[0] = 0; /*intel->vtbl.flush_cmd();*/
+       ((int *)batch->ptr)[0] = intel->vtbl.flush_cmd();
       ((int *)batch->ptr)[1] = 0;
       ((int *)batch->ptr)[2] = MI_BATCH_BUFFER_END;
       used += 12;
    }
    else {
-     ((int *)batch->ptr)[0] = /* intel->vtbl.flush_cmd(); */
+       ((int *)batch->ptr)[0] = intel->vtbl.flush_cmd() ; 
       ((int *)batch->ptr)[1] = MI_BATCH_BUFFER_END;
       used += 8;
    }