aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch541
1 files changed, 541 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch
new file mode 100644
index 00000000..88df9914
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2068-drm-amdgpu-change-redundant-init-logs-to-debug-level.patch
@@ -0,0 +1,541 @@
+From 3b3e76a6a7714c346dcabe0fe0a4f54cce74f384 Mon Sep 17 00:00:00 2001
+From: pding <Pixel.Ding@amd.com>
+Date: Thu, 26 Oct 2017 09:30:38 +0800
+Subject: [PATCH 2068/4131] drm/amdgpu: change redundant init logs to debug
+ level
+
+When this VF stays in exclusive mode for long, other VFs will be
+impacted.
+
+The redundant messages causes exclusive mode timeout when they're
+redirected. That is a normal use case for cloud service to redirect
+guest log to virtual serial port.
+
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: pding <Pixel.Ding@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 8 ++++----
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 ++++----
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 4 ++--
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 6 +++---
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 6 +++---
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 2 +-
+ 24 files changed, 47 insertions(+), 50 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+index f45ab47..c99ad38 100755
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+@@ -100,7 +100,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
+ kfd2kgd = amdgpu_amdkfd_gfx_9_0_get_functions();
+ break;
+ default:
+- dev_info(adev->dev, "kfd not supported on this ASIC\n");
++ dev_dbg(adev->dev, "kfd not supported on this ASIC\n");
+ return;
+ }
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+index 337180e..31a96a3 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c
+@@ -690,12 +690,12 @@ int amdgpu_atombios_get_clock_info(struct amdgpu_device *adev)
+ le32_to_cpu(firmware_info->info_21.ulDefaultDispEngineClkFreq);
+ /* set a reasonable default for DP */
+ if (adev->clock.default_dispclk < 53900) {
+- DRM_INFO("Changing default dispclk from %dMhz to 600Mhz\n",
+- adev->clock.default_dispclk / 100);
++ DRM_DEBUG("Changing default dispclk from %dMhz to 600Mhz\n",
++ adev->clock.default_dispclk / 100);
+ adev->clock.default_dispclk = 60000;
+ } else if (adev->clock.default_dispclk <= 60000) {
+- DRM_INFO("Changing default dispclk from %dMhz to 625Mhz\n",
+- adev->clock.default_dispclk / 100);
++ DRM_DEBUG("Changing default dispclk from %dMhz to 625Mhz\n",
++ adev->clock.default_dispclk / 100);
+ adev->clock.default_dispclk = 62500;
+ }
+ adev->clock.dp_extclk =
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+index 29349bf..3e45e93 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+@@ -1029,7 +1029,7 @@ static int amdgpu_atombios_init(struct amdgpu_device *adev)
+ atom_card_info->ioreg_read = cail_ioreg_read;
+ atom_card_info->ioreg_write = cail_ioreg_write;
+ } else {
+- DRM_INFO("PCI I/O BAR is not found. Using MMIO to access ATOM BIOS\n");
++ DRM_DEBUG("PCI I/O BAR is not found. Using MMIO to access ATOM BIOS\n");
+ atom_card_info->ioreg_read = cail_reg_read;
+ atom_card_info->ioreg_write = cail_reg_write;
+ }
+@@ -2290,8 +2290,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
+ dev_err(adev->dev, "gpu post error!\n");
+ goto failed;
+ }
+- } else {
+- DRM_INFO("GPU post is not needed\n");
+ }
+
+ if (adev->is_atom_fw) {
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+index 13bd982..973d14a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+@@ -295,7 +295,6 @@ MODULE_PARM_DESC(cik_support, "CIK support (1 = enabled (default), 0 = disabled)
+ module_param_named(cik_support, amdgpu_cik_support, int, 0444);
+ #endif
+
+-
+ static const struct pci_device_id pciidlist[] = {
+ #ifdef CONFIG_DRM_AMDGPU_SI
+ {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+index f43319c..80ee1c1 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+@@ -390,9 +390,9 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
+ ring->fence_drv.irq_type = irq_type;
+ ring->fence_drv.initialized = true;
+
+- dev_info(adev->dev, "fence driver on ring %d use gpu addr 0x%016llx, "
+- "cpu addr 0x%p\n", ring->idx,
+- ring->fence_drv.gpu_addr, ring->fence_drv.cpu_addr);
++ dev_dbg(adev->dev, "fence driver on ring %d use gpu addr 0x%016llx, "
++ "cpu addr 0x%p\n", ring->idx,
++ ring->fence_drv.gpu_addr, ring->fence_drv.cpu_addr);
+ return 0;
+ }
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+index 519b156..17df54a 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+@@ -232,7 +232,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
+ int ret = pci_enable_msi(adev->pdev);
+ if (!ret) {
+ adev->irq.msi_enabled = true;
+- dev_info(adev->dev, "amdgpu: using MSI.\n");
++ dev_dbg(adev->dev, "amdgpu: using MSI.\n");
+ }
+ }
+
+@@ -262,7 +262,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
+ return r;
+ }
+
+- DRM_INFO("amdgpu: irq initialized.\n");
++ DRM_DEBUG("amdgpu: irq initialized.\n");
+ return 0;
+ }
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+index 458e0d8..a579076 100755
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+@@ -822,8 +822,8 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
+ adev->mc.vram_mtrr = arch_phys_wc_add(adev->mc.aper_base,
+ adev->mc.aper_size);
+ DRM_INFO("Detected VRAM RAM=%lluM, BAR=%lluM\n",
+- adev->mc.mc_vram_size >> 20,
+- (unsigned long long)adev->mc.aper_size >> 20);
++ adev->mc.mc_vram_size >> 20,
++ (unsigned long long)adev->mc.aper_size >> 20);
+ DRM_INFO("RAM width %dbits %s\n",
+ adev->mc.vram_width, amdgpu_vram_names[adev->mc.vram_type]);
+ return amdgpu_ttm_init(adev);
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+index c69673f..af7e83d 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+@@ -1221,7 +1221,7 @@ int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+index 873c995..92477e6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+@@ -954,7 +954,7 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed\n",
+@@ -999,7 +999,7 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+ error:
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+index 7a9d388..e34b07f 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+@@ -265,7 +265,7 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+@@ -471,7 +471,7 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+
+@@ -504,7 +504,7 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed\n",
+@@ -647,7 +647,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+ error:
+diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+index 80822e6..37e2a7f 100644
+--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
++++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+@@ -657,7 +657,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+ ring->idx, tmp);
+@@ -724,7 +724,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = le32_to_cpu(adev->wb.wb[index]);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+index dbbe986..9430d48 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+@@ -1798,7 +1798,7 @@ static int gfx_v6_0_ring_test_ring(struct amdgpu_ring *ring)
+ DRM_UDELAY(1);
+ }
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",
+ ring->idx, scratch, tmp);
+@@ -1951,7 +1951,7 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = RREG32(scratch);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (scratch(0x%04X)=0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+index 28e22f7..84827a7 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+@@ -2071,7 +2071,7 @@ static int gfx_v7_0_ring_test_ring(struct amdgpu_ring *ring)
+ DRM_UDELAY(1);
+ }
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",
+ ring->idx, scratch, tmp);
+@@ -2351,7 +2351,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = RREG32(scratch);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (scratch(0x%04X)=0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+index f9de8d8..f474e17 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+@@ -804,7 +804,7 @@ static int gfx_v8_0_ring_test_ring(struct amdgpu_ring *ring)
+ DRM_UDELAY(1);
+ }
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",
+@@ -856,7 +856,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = RREG32(scratch);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (scratch(0x%04X)=0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index 415116b..8568614 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -318,7 +318,7 @@ static int gfx_v9_0_ring_test_ring(struct amdgpu_ring *ring)
+ DRM_UDELAY(1);
+ }
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",
+@@ -370,7 +370,7 @@ static int gfx_v9_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = RREG32(scratch);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (scratch(0x%04X)=0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+index a9c1845..61a5400 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+@@ -633,7 +633,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+ ring->idx, tmp);
+@@ -704,7 +704,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = le32_to_cpu(adev->wb.wb[index]);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+index 1c5de2e..0971884 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+@@ -893,7 +893,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+ ring->idx, tmp);
+@@ -964,7 +964,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = le32_to_cpu(adev->wb.wb[index]);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+index 2909606..888ae39 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+@@ -919,7 +919,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+ ring->idx, tmp);
+@@ -990,7 +990,7 @@ static int sdma_v4_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = le32_to_cpu(adev->wb.wb[index]);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
+diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
+index 3fa2fbf..ee469a9 100644
+--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
++++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
+@@ -252,7 +252,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+ ring->idx, tmp);
+@@ -317,7 +317,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ }
+ tmp = le32_to_cpu(adev->wb.wb[index]);
+ if (tmp == 0xDEADBEEF) {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ } else {
+ DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+index 8ab0f78..15771a5 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+@@ -521,7 +521,7 @@ static int uvd_v4_2_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+index bb6d46e..3b29aab 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
+@@ -536,7 +536,7 @@ static int uvd_v5_0_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+index 58e400a..dc5a00e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+@@ -184,7 +184,7 @@ static int uvd_v6_0_enc_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed\n",
+@@ -360,7 +360,7 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+ error:
+@@ -998,7 +998,7 @@ static int uvd_v6_0_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+index 762ff39..7b77339 100644
+--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+@@ -184,7 +184,7 @@ static int uvd_v7_0_enc_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed\n",
+@@ -359,7 +359,7 @@ static int uvd_v7_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
+ } else if (r < 0) {
+ DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
+ } else {
+- DRM_INFO("ib test on ring %d succeeded\n", ring->idx);
++ DRM_DEBUG("ib test on ring %d succeeded\n", ring->idx);
+ r = 0;
+ }
+ error:
+@@ -1192,7 +1192,7 @@ static int uvd_v7_0_ring_test_ring(struct amdgpu_ring *ring)
+ }
+
+ if (i < adev->usec_timeout) {
+- DRM_INFO("ring test on %d succeeded in %d usecs\n",
++ DRM_DEBUG("ring test on %d succeeded in %d usecs\n",
+ ring->idx, i);
+ } else {
+ DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",
+diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+index fe02f0a..20d9721 100644
+--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
++++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+@@ -119,7 +119,7 @@ static int pp_sw_init(void *handle)
+
+ ret = hwmgr->smumgr_funcs->smu_init(hwmgr);
+
+- pr_info("amdgpu: powerplay sw initialized\n");
++ pr_debug("amdgpu: powerplay sw initialized\n");
+ }
+ return ret;
+ }
+--
+2.7.4
+