[04/13] i830_memory: kill i830_desribe_allocations

Commit Message

Daniel Vetter March 2, 2010, 8:22 a.m. UTC

None

Patch

diff --git a/src/i830.h b/src/i830.h
index 0924d71..5789976 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -451,8 +451,6 @@  void i830_allocator_fini(ScrnInfoPtr scrn);
 i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
 				  unsigned long size, unsigned long pitch,
 				  int flags, uint32_t tile_format);
-void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity,
-			       const char *prefix);
 void i830_reset_allocations(ScrnInfoPtr scrn);
 void i830_free_3d_memory(ScrnInfoPtr scrn);
 void i830_free_memory(ScrnInfoPtr scrn, i830_memory * mem);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 75b3303..14d4432 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1413,8 +1413,6 @@  static Bool I830EnterVT(int scrnIndex, int flags)
 	if (!i830_bind_all_memory(scrn))
 		return FALSE;
 
-	i830_describe_allocations(scrn, 1, "");
-
 	intel_batch_init(scrn);
 
 	if (IS_I965G(intel))
diff --git a/src/i830_memory.c b/src/i830_memory.c
index f1804f4..4202aa5 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -375,61 +375,6 @@  i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
 	return mem;
 }
 
-void
-i830_describe_allocations(ScrnInfoPtr scrn, int verbosity, const char *prefix)
-{
-	intel_screen_private *intel = intel_get_screen_private(scrn);
-	i830_memory *mem;
-
-	if (intel->memory_list == NULL) {
-		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-			       "%sMemory allocator not initialized\n", prefix);
-		return;
-	}
-
-	if (intel->memory_list->next->next == NULL) {
-		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-			       "%sNo memory allocations\n", prefix);
-		return;
-	}
-
-	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-		       "%sFixed memory allocation layout:\n", prefix);
-
-	for (mem = intel->memory_list->next; mem->next != NULL; mem = mem->next) {
-		char phys_suffix[32] = "";
-		char *tile_suffix = "";
-
-		if (mem->tiling_mode == I915_TILING_X)
-			tile_suffix = " X tiled";
-		else if (mem->tiling_mode == I915_TILING_Y)
-			tile_suffix = " Y tiled";
-
-		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-			       "%s0x%08lx: %s (%ld kB%s)%s\n", prefix,
-			       mem->bo->offset, mem->name,
-			       mem->size / 1024, phys_suffix, tile_suffix);
-	}
-	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-		       "%s0x%08lx:            end of aperture\n",
-		       prefix, intel->FbMapSize);
-
-	xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-		       "%sBO memory allocation layout:\n", prefix);
-	for (mem = intel->bo_list; mem != NULL; mem = mem->next) {
-		char *tile_suffix = "";
-
-		if (mem->tiling_mode == I915_TILING_X)
-			tile_suffix = " X tiled";
-		else if (mem->tiling_mode == I915_TILING_Y)
-			tile_suffix = " Y tiled";
-
-		xf86DrvMsgVerb(scrn->scrnIndex, X_INFO, verbosity,
-			       "%sunpinned          : %s (%ld kB)%s\n", prefix,
-			       mem->name, mem->size / 1024, tile_suffix);
-	}
-}
-
 static Bool IsTileable(ScrnInfoPtr scrn, int pitch)
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 43b9fcc..9721eba 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -357,9 +357,6 @@  static Bool i915_allocate_xvmc_buffers(ScrnInfoPtr scrn,
 		return FALSE;
 	}
 
-	if (1)
-		i830_describe_allocations(scrn, 1, "i915_mc: ");
-
 	return TRUE;
 }
 
@@ -604,9 +601,6 @@  static int i915_xvmc_create_surface(ScrnInfoPtr scrn, XvMCSurfacePtr pSurf,
 		return BadAlloc;
 	}
 
-	if (0)
-		i830_describe_allocations(scrn, 1, "");
-
 	if (drmAddMap(intel->drmSubFD,
 		      (drm_handle_t) (sfpriv->surface->bo->offset +
 				      intel->LinearAddr), sfpriv->surface->size,