diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 13:46:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-02 13:46:56 -0400 |
| commit | 6b9886a173ff6c9ed528979c4d0a3566c1f61013 (patch) | |
| tree | b09dc02c72225f29565d2477d4a27681fffbfcec | |
| parent | 6ffbb1964afe1236951f7ac30aa0ed202673e374 (diff) | |
| parent | 6c7be29810dd85b4fe75588ec536446c1579d492 (diff) | |
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.c | 4 |
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 3331f88dcfb6..248ab4a7d39f 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) | |||
| 223 | return 0; | 223 | return 0; |
| 224 | DRM_UDELAY(1); | 224 | DRM_UDELAY(1); |
| 225 | } | 225 | } |
| 226 | DRM_INFO("wait for fifo failed status : 0x%08X 0x%08X\n", | 226 | DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n", |
| 227 | RADEON_READ(RADEON_RBBM_STATUS), | 227 | RADEON_READ(RADEON_RBBM_STATUS), |
| 228 | RADEON_READ(R300_VAP_CNTL_STATUS)); | 228 | RADEON_READ(R300_VAP_CNTL_STATUS)); |
| 229 | 229 | ||
| @@ -252,7 +252,7 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv) | |||
| 252 | } | 252 | } |
| 253 | DRM_UDELAY(1); | 253 | DRM_UDELAY(1); |
| 254 | } | 254 | } |
| 255 | DRM_INFO("wait idle failed status : 0x%08X 0x%08X\n", | 255 | DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n", |
| 256 | RADEON_READ(RADEON_RBBM_STATUS), | 256 | RADEON_READ(RADEON_RBBM_STATUS), |
| 257 | RADEON_READ(R300_VAP_CNTL_STATUS)); | 257 | RADEON_READ(R300_VAP_CNTL_STATUS)); |
| 258 | 258 | ||