Move i915_disasm to later so we can use the hardware offset.

diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
index 1edbb618d34e13580b9de02c3b435740875439a6..5aabef96aea89c0e07b98864cab94ddbbbd36953 100644 (file)
--- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c
@@ -27,6 +27,7 @@
 
 #include "intel_batchbuffer.h"
 #include "intel_ioctl.h"
+#include "i915_disasm.h"
 
 /* Relocations in kernel space:
  *    - pass dma buffer seperately
@@ -144,9 +145,6 @@ do_flush_locked(struct intel_batchbuffer *batch,
       dri_bo_unreference(r->buf);
    }
 
-   if (INTEL_DEBUG & DEBUG_BATCH)
-      i915_disasm(ptr, used / 4, 0);
-
    dri_bo_unmap(batch->buf);
    batch->map = NULL;
    batch->ptr = NULL;
@@ -196,6 +194,12 @@ do_flush_locked(struct intel_batchbuffer *batch,
       }
       intel->vtbl.lost_hardware(intel);
    }
+
+   if (INTEL_DEBUG & DEBUG_BATCH) {
+      dri_bo_map(batch->buf, GL_FALSE);
+      i915_disasm(ptr, used / 4, batch->buf->offset);
+      dri_bo_unmap(batch->buf);
+   }
 }