Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / gpu / drm / radeon / radeon_cp.c

diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index 3331f88dcfb641a4d1d54addc68744ebac2e2646..248ab4a7d39fdb42a1073f48cceca3ed237d28ce 100644 (file)
--- 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));