summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-01-31 14:10:36 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2014-01-31 14:29:49 +0000
commit098a1163e9730b428351fa54e8765261f5350d21 (patch)
tree71c4fba886fda05b525fe44b7c7911ed074b5166
parent166e8e9e5d79f64e30230d9520b9f6cafa7dd0d0 (diff)
sna: Show the memory debug info again
This needs to be visible whenever we --enable-debug=memory. Make it so, and trim it to a single line in the process. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index abfc0527..ed99c9c1 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -16545,14 +16545,12 @@ static bool sna_accel_do_debug_memory(struct sna *sna)
static void sna_accel_debug_memory(struct sna *sna)
{
- DBG(("Allocated pixmaps: %d\n",
- sna->debug_memory.pixmap_allocs));
- DBG(("Allocated bo: %d, %ld bytes\n",
- sna->kgem.debug_memory.bo_allocs,
- (long)sna->kgem.debug_memory.bo_bytes));
- DBG(("Allocated CPU bo: %d, %ld bytes\n",
- sna->debug_memory.cpu_bo_allocs,
- (long)sna->debug_memory.cpu_bo_bytes));
+ ErrorF("Allocated pixmaps: %d, bo: %d, %ld bytes (CPU bo: %d, %ld bytes)\n",
+ sna->debug_memory.pixmap_allocs,
+ sna->kgem.debug_memory.bo_allocs,
+ (long)sna->kgem.debug_memory.bo_bytes,
+ sna->debug_memory.cpu_bo_allocs,
+ (long)sna->debug_memory.cpu_bo_bytes);
#ifdef VALGRIND_DO_ADDED_LEAK_CHECK
VG(VALGRIND_DO_ADDED_LEAK_CHECK);