From 9adc9584a7e0b61b16a943720bef31a71faeaef4 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 12 Sep 2006 17:39:44 +0200
Subject: Fix some debug messages.

---
 linux-core/drm_bo.c    | 28 +++++++---------------------
 linux-core/drm_fence.c | 16 ++++------------
 linux-core/drm_ttm.c   |  3 ---
 3 files changed, 11 insertions(+), 36 deletions(-)

(limited to 'linux-core')

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index abad398f..f5a25c26 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -149,9 +149,7 @@ static void drm_bo_delayed_delete(drm_device_t * dev)
 			entry->fence = NULL;
 		}
 		if (!entry->fence) {
-#ifdef BODEBUG
-			DRM_ERROR("Destroying delayed buffer object\n");
-#endif
+			DRM_DEBUG("Destroying delayed buffer object\n");
 			list_del(&entry->ddestroy);
 			drm_bo_destroy_locked(dev, entry);
 		}
@@ -165,9 +163,8 @@ static void drm_bo_delayed_workqueue(void *data)
 	drm_device_t *dev = (drm_device_t *) data;
 	drm_buffer_manager_t *bm = &dev->bm;
 
-#ifdef BODEBUG
-	DRM_ERROR("Delayed delete Worker\n");
-#endif
+	DRM_DEBUG("Delayed delete Worker\n");
+
 	drm_bo_delayed_delete(dev);
 	mutex_lock(&dev->struct_mutex);
 	if (!list_empty(&bm->ddestroy)) {
@@ -292,19 +289,12 @@ int drm_fence_buffer_objects(drm_file_t * priv,
 				list_add_tail(&entry->head, &bm->vram_lru);
 			else
 				list_add_tail(&entry->head, &bm->other);
-		} else {
-#ifdef BODEBUG
-			DRM_ERROR("Huh? Fenced object on unfenced list\n");
-#endif
-		}
-		mutex_unlock(&entry->mutex);
+		} 		mutex_unlock(&entry->mutex);
 		drm_bo_usage_deref_locked(dev, entry);
 		l = f_list.next;
 	}
 	atomic_add(count, &fence->usage);
-#ifdef BODEBUG
-	DRM_ERROR("Fenced %d buffers\n", count);
-#endif
+	DRM_DEBUG("Fenced %d buffers\n", count);
       out:
 	mutex_unlock(&dev->struct_mutex);
 	*used_fence = fence;
@@ -461,9 +451,7 @@ static int drm_move_local_to_tt(drm_buffer_object_t * bo, int no_wait)
 
 	if (ret)
 		return ret;
-#ifdef BODEBUG
-	DRM_ERROR("Flipping in to AGP 0x%08lx\n", bo->tt->start);
-#endif
+	DRM_DEBUG("Flipping in to AGP 0x%08lx\n", bo->tt->start);
 	mutex_lock(&dev->struct_mutex);
 	ret = drm_bind_ttm_region(bo->ttm_region, bo->tt->start);
 	if (ret) {
@@ -998,9 +986,7 @@ static int drm_buffer_object_validate(drm_buffer_object_t * bo,
 		DRM_ERROR("Cached binding not implemented yet\n");
 		return -EINVAL;
 	}
-#ifdef BODEBUG
-	DRM_ERROR("New flags 0x%08x, Old flags 0x%08x\n", new_flags, bo->flags);
-#endif
+	DRM_DEBUG("New flags 0x%08x, Old flags 0x%08x\n", new_flags, bo->flags);
 	ret = driver->fence_type(new_flags, &bo->fence_class, &bo->fence_flags);
 	if (ret) {
 		DRM_ERROR("Driver did not support given buffer permissions\n");
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index 4ee5d2d0..9ade8114 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -111,10 +111,8 @@ void drm_fence_handler(drm_device_t * dev, uint32_t sequence, uint32_t type)
 		relevant = type & fence->type;
 		if ((fence->signaled | relevant) != fence->signaled) {
 			fence->signaled |= relevant;
-#ifdef BODEBUG
-			DRM_ERROR("Fence 0x%08lx signaled 0x%08x\n",
+			DRM_DEBUG("Fence 0x%08lx signaled 0x%08x\n",
 				  fence->base.hash.key, fence->signaled);
-#endif
 			fence->submitted_flush |= relevant;
 			wake = 1;
 		}
@@ -134,10 +132,8 @@ void drm_fence_handler(drm_device_t * dev, uint32_t sequence, uint32_t type)
 		 */
 
 		if (!(fence->type & ~fence->signaled)) {
-#ifdef BODEBUG
-			DRM_ERROR("Fence completely signaled 0x%08lx\n",
+			DRM_DEBUG("Fence completely signaled 0x%08lx\n",
 				  fence->base.hash.key);
-#endif
 			fence_list = &fence->ring;
 			for (i = 0; i < driver->no_types; ++i) {
 				if (fm->fence_types[i] == fence_list)
@@ -180,10 +176,8 @@ void drm_fence_usage_deref_locked(drm_device_t * dev,
 {
 	if (atomic_dec_and_test(&fence->usage)) {
 		drm_fence_unring(dev, &fence->ring);
-#ifdef BODEBUG
-		DRM_ERROR("Destroyed a fence object 0x%08lx\n",
+		DRM_DEBUG("Destroyed a fence object 0x%08lx\n",
 			  fence->base.hash.key);
-#endif
 		kmem_cache_free(drm_cache.fence_object, fence);
 	}
 }
@@ -468,9 +462,7 @@ int drm_fence_add_user_object(drm_file_t * priv, drm_fence_object_t * fence,
 		return ret;
 	fence->base.type = drm_fence_type;
 	fence->base.remove = &drm_fence_object_destroy;
-#ifdef BODEBUG
-	DRM_ERROR("Fence 0x%08lx created\n", fence->base.hash.key);
-#endif
+	DRM_DEBUG("Fence 0x%08lx created\n", fence->base.hash.key);
 	return 0;
 }
 
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c
index 8aba36ca..889e0001 100644
--- a/linux-core/drm_ttm.c
+++ b/linux-core/drm_ttm.c
@@ -488,9 +488,6 @@ int drm_evict_ttm_region(drm_ttm_backend_list_t * entry)
 						entry->num_pages);
 				drm_ttm_unlock_mm(ttm, 0, 1);
 			}
-#ifdef BODEBUG
-			DRM_ERROR("Unbinding\n");
-#endif
 			be->unbind(entry->be);
 			if (ttm && be->needs_cache_adjust(be)) {
 				drm_set_caching(ttm, entry->page_offset,
-- 
cgit v1.2.3