From 54c31859996fb09222c18282dd07a25bc36e2b0c Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Sun, 5 Apr 2009 16:55:27 -0400
Subject: [PATCH] radeon: Don't print results of microcode writeback if disabled


Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 shared-core/radeon_cp.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 6771d4f..1d334db 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -704,16 +704,17 @@ static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
 		DRM_UDELAY(1);
 	}
 
-	if (tmp < dev_priv->usec_timeout) {
-		dev_priv->writeback_works = 1;
-		DRM_INFO("writeback test succeeded in %d usecs\n", tmp);
-	} else {
-		dev_priv->writeback_works = 0;
-		DRM_INFO("writeback test failed\n");
-	}
 	if (radeon_no_wb == 1) {
 		dev_priv->writeback_works = 0;
-		DRM_INFO("writeback forced off\n");
+		DRM_INFO("writeback test forced off\n");
+	} else {
+		if (tmp < dev_priv->usec_timeout) {
+			dev_priv->writeback_works = 1;
+			DRM_INFO("writeback test succeeded in %d usecs\n", tmp);
+		} else {
+			dev_priv->writeback_works = 0;
+			DRM_INFO("writeback test failed\n");
+		}
 	}
 
 	if (!dev_priv->writeback_works) {
-- 
1.6.0.6

