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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 5432af39a674a9b2d3c38039e17433592c4bea86..c70cda04dbfb921a026313924b9f98c4e83e6904 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -85,7 +85,7 @@ void amdgpu_amdkfd_device_probe(struct amdgpu_device *adev)
                kfd2kgd = amdgpu_amdkfd_gfx_8_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 f450b69323fad1fef04131f86775c0e9b4bf8bdd..39f4d0df1adaf2352f39ae9232a1108d3bb1d950 100644 (file)
--- 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 d5d450e380bdff87a63764f7de948065aa9cc9ae..212138476130b4d5d805acaa7c6737f9d92adff7 100644 (file)
--- 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;
        }
@@ -2267,8 +2267,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 c2f414ffb2cc205c40873afaabeee821ffa816e6..6b11a75839e2705f647796461803d79084a67b33 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -306,7 +306,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 72e8eacc2c03ad719ff89885c8ab21b22a2d0349..eda89dfdef5bf187af4e648255b24440e077cddf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -391,9 +391,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 47c5ce9807db28f8f9e6906ca53338cbee24742a..32590e4f9f7a63a689acc078e2a80e250e18b422 100644 (file)
--- 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 ea25164e7f4b21ea4d0f9875ef32bbfb09edfa9c..c48fc450d99beb0aae461fe4d7e8289148afbbcb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -779,8 +779,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 6604771356cd909d1f337807b90016510e791766..be607b2be4e9631355f00326ab2192f6b07c4f03 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1218,7 +1218,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 873c99518954e0566918b3e03c0311e9c6e28f33..92477e67087cba4b2a372b329c0e97253e1a0741 100644 (file)
--- 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 96df21cca85ded164034a9a1e640af2baa21d53b..dabaca4da7f260af1910a1369c73a5d6397e0112 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -261,7 +261,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",
@@ -467,7 +467,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;
        }
 
@@ -500,7 +500,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",
@@ -643,7 +643,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 60cecd117705b53f785376806af275968f1fa89d..ed26dcbc4f795c188dd9b008f3d2280df463276a 100644 (file)
--- 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 dbbe986f90f29ffb6c77662866e336d8130d1af2..9430d4809b530c09a57192de6b9ba9ed5fe67906 100644 (file)
--- 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 419ba0ce7ee5b0cc343e14665ab61d91f3801d93..015f37bef358a680e1fb8a26e7d04ea6f57b3650 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2085,7 +2085,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);
@@ -2365,7 +2365,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 9ecdf621a74a14994e9f657d161e8aa9c5cc3a52..9f93e05bf97e84473ee4554298e877d6c21b9ac3 100644 (file)
--- 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 da43813d67a4ad56ddecb79ac0a749afe29abc43..a5811e80e21bab165bf18731b9690f8c41d7414b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -327,7 +327,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",
@@ -379,7 +379,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 67f375bfe45204436095ee41b59f75563d37c91f..92f8c44a73b6df68a97c129c17f3c8aa6b20cc7d 100644 (file)
--- 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 6d06f8eb659fadb32779bad8293ad220ce49fcd2..52e6bf2e9e595ad569fa0a01aa5fdd550cfbd983 100644 (file)
--- 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 46009db3d195cb56b4c204d6e83cc451b5cd593a..fe78c00b9ffa793df52709ccd5cf58533eaa8e51 100644 (file)
--- 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 3fa2fbf8c9a189921f933ed5fc7fe0064a0bf695..ee469a906cd371f37ebf1cad85c51afd567584ee 100644 (file)
--- 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 8ab0f78794a5685af75dd6d9946e2854e00efe6a..15771a53038eae19b08433d727e5ba148227792e 100644 (file)
--- 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 bb6d46e168a3cdbd0401012a11493ec3700e38f2..3b29aaba783a213b74947aba27103b37ace498b8 100644 (file)
--- 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 246dfd74f5c9610177b0928ec595c6476b1ba2c4..0c01825a8b9ee85e55d19a3404fa8562b36c2819 100644 (file)
--- 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:
@@ -1008,7 +1008,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 762ff3901a7ad2a0d34f4d8ccec9dfbf996c7f82..7b77339feb1a96e98fe037685404597b3db18208 100644 (file)
--- 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 c7e34128cbde1a1c3687bd81a689bf87ad8c8f59..726425809eedbd9d85dd00356b400d9c94108f88 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -122,7 +122,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;
 }