Merge branch 'gallium-0.2' into gallium-winsys-private

2 files changed, 1 insertions, 13 deletions

diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c b/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
index 517c693a9b..d9556e1f38 100644
--- a/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_be_batchbuffer.c
@@ -68,8 +68,6 @@ intel_be_offset_relocation(struct intel_be_batchbuffer *batch,
 
 	offset = (unsigned)(batch->base.ptr - batch->base.map);
 
-	debug_printf("   - offset: %p\n", offset);
-
 	ret = drm_intel_bo_emit_reloc(batch->bo, offset,
 	                              bo, pre_add,
 	                              read_domains,
@@ -106,18 +104,10 @@ intel_be_batchbuffer_flush(struct intel_be_batchbuffer *batch,
 		i915_batchbuffer_dword(i915, (0x0<<29)|(0xA<<23)); // MI_BATCH_BUFFER_END;
 	}
 
-	i915_dump_batchbuffer(i915);
-	debug_printf("%s\n", __FUNCTION__);
-
 	used = batch->base.ptr - batch->base.map;
 
-	debug_printf("   - subdata\n");
 	drm_intel_bo_subdata(batch->bo, 0, used, batch->base.map);
-	debug_printf("   - exec\n");
 	ret = drm_intel_bo_exec(batch->bo, used, NULL, 0, 0);
-	debug_printf("   - waiting\n");
-	drm_intel_bo_wait_rendering(batch->bo);
-	debug_printf("   - done\n");
 
 	assert(ret == 0);
 
diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_context.c b/src/gallium/winsys/drm/intel/gem/intel_be_context.c
index c1f18a3a04..95e761d78d 100644
--- a/src/gallium/winsys/drm/intel/gem/intel_be_context.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_be_context.c
@@ -33,15 +33,13 @@ intel_be_batch_reloc(struct i915_winsys *sws,
 		read |= I915_GEM_DOMAIN_VERTEX;
 	}
 
-    debug_printf("%s\n", __FUNCTION__);
-	debug_printf("   - flags: %u, read: %u, write: %u, delta: %p\n", access_flags, read, write, delta);
 	ret = intel_be_offset_relocation(intel->batch,
 	                                 delta,
 	                                 bo,
 	                                 read,
 	                                 write);
-    debug_printf("   - ret = %i\n", ret);
     assert(ret == 0);
+
 	/* TODO change return type */
 	/* return ret; */
 }