aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 10:46:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 10:46:56 -0700
commit6b9886a173ff6c9ed528979c4d0a3566c1f61013 (patch)
treeb09dc02c72225f29565d2477d4a27681fffbfcec
parent6ffbb1964afe1236951f7ac30aa0ed202673e374 (diff)
parent6c7be29810dd85b4fe75588ec536446c1579d492 (diff)
downloadkernel_samsung_aries-6b9886a173ff6c9ed528979c4d0a3566c1f61013.zip
kernel_samsung_aries-6b9886a173ff6c9ed528979c4d0a3566c1f61013.tar.gz
kernel_samsung_aries-6b9886a173ff6c9ed528979c4d0a3566c1f61013.tar.bz2
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: downgrade debug message from info to debug.
-rw-r--r--drivers/gpu/drm/radeon/radeon_cp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 3331f88..248ab4a 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -223,7 +223,7 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
return 0;
DRM_UDELAY(1);
}
- DRM_INFO("wait for fifo failed status : 0x%08X 0x%08X\n",
+ DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n",
RADEON_READ(RADEON_RBBM_STATUS),
RADEON_READ(R300_VAP_CNTL_STATUS));
@@ -252,7 +252,7 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
}
DRM_UDELAY(1);
}
- DRM_INFO("wait idle failed status : 0x%08X 0x%08X\n",
+ DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n",
RADEON_READ(RADEON_RBBM_STATUS),
RADEON_READ(R300_VAP_CNTL_STATUS));