From ebc8180d534e5d7f9d1e2cdae62f595665ca8c80 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 5 Apr 2009 16:05:26 -0400 Subject: [PATCH] radeon: Don't print results of microcode writeback if disabled Signed-off-by: Matt Turner --- shared-core/radeon_cp.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 6771d4f..4cd58c3 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"); + } 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