drm/amdgpu: change redundant init logs to debug level
Subsystems (3)
PATCH 1/7 drm/amdgpu: change redundant init logs to debug level
From: pding <[email protected]>
This is v2 of init log changing. init_log parm and SRIOV specific macro are removed, so I rename the patch. Exclusive mode consumes 230ms with this patch and log redirection, that is acceptable.
Please review.
---
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.
--- 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 | 10 ++++------ 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/amdgpu_vm.c | 4 ++-- 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 +- 25 files changed, 52 insertions(+), 55 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +1 -1
@@ -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 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +4 -4
@@ -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 =
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +4 -6
@@ -614,8 +614,8 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64if (limit && limit < mc->real_vram_size) mc->real_vram_size = limit;dev_info (adev->dev,"VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n" , - mc->mc_vram_size >>20 , mc->vram_start, - mc->vram_end, mc->real_vram_size >>20 ); + mc->mc_vram_size >>20 , mc->vram_start, + mc->vram_end, mc->real_vram_size >>20 ); }/**
@@ -651,7 +651,7 @@ void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) } mc->gart_end = mc->gart_start + mc->gart_size -1 ;dev_info (adev->dev,"GTT: %lluM 0x%016llX - 0x%016llX\n" , - mc->gart_size >>20 , mc->gart_start, mc->gart_end); + mc->gart_size >>20 , mc->gart_start, mc->gart_end); }/*
@@ -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; }
@@ -2265,8 +2265,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) {
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0 -1
@@ -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},
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +3 -3
@@ -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); +DRM_DEV_DEBUG (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 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2 -2
@@ -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 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -1
@@ -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 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
@@ -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:
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +4 -4
@@ -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:
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2 -2
@@ -2595,8 +2595,8 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size,amdgpu_vm_set_fragment_size (adev, fragment_size_default);DRM_INFO ("vm size is %llu GB, block size is %u-bit, fragment size is %u-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size, - adev->vm_manager.fragment_size); + adev->vm_manager.vm_size, adev->vm_manager.block_size, + adev->vm_manager.fragment_size); }/**
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
@@ -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",
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +2 -2
@@ -2069,7 +2069,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);
@@ -2349,7 +2349,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",
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -2
@@ -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",
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -2
@@ -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",
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/si_dma.c +2 -2
@@ -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);
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1 -1
@@ -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",
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1 -1
@@ -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",
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +3 -3
@@ -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:
@@ -1010,7 +1010,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",
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +3 -3
@@ -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:
@@ -1198,7 +1198,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",
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1 -1
@@ -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; }
Signature · 6 lines
2.9.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Alex Deucher
Reviewed-byQuoted 12 lines · Pixel Ding
From: pding <[email protected]>
This is v2 of init log changing.
init_logparm and SRIOV specific macro are removed, so I rename the patch. Exclusive mode consumes 230ms with this patch and log redirection, that is acceptable.Please review.
---
When this VF stays in exclusive mode for long, other VFs will be impacted.
Quoted 5 lines
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.
Signed-off-by pding <[email protected]>
A few comments below. With those fixed, the patch is:
Quoted 67 lines
--- 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 | 10 ++++------ 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/amdgpu_vm.c | 4 ++-- 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 +- 25 files changed, 52 insertions(+), 55 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +1
-1@@ -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 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +4
-4@@ -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 =drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64 · line 618
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +2
-2@@ -614,8 +614,8 @@ void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc, u64if (limit && limit < mc->real_vram_size) mc->real_vram_size = limit;dev_info (adev->dev,"VRAM: %lluM 0x%016llX - 0x%016llX (%lluM used)\n" , - mc->mc_vram_size >>20 , mc->vram_start, - mc->vram_end, mc->real_vram_size >>20 ); + mc->mc_vram_size >>20 , mc->vram_start, + mc->vram_end, mc->real_vram_size >>20 );
Drop the whitespace change here.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) · line 654
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-1}/** @@ -651,7 +651,7 @@ void amdgpu_gart_location(struct amdgpu_device *adev, struct amdgpu_mc *mc) } mc->gart_end = mc->gart_start + mc->gart_size -1 ;dev_info (adev->dev,"GTT: %lluM 0x%016llX - 0x%016llX\n" , - mc->gart_size >>20 , mc->gart_start, mc->gart_end); + mc->gart_size >>20 , mc->gart_start, mc->gart_end);
Same here.
Quoted 38 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-3}/* @@ -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; }@@ -2265,8 +2265,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) {drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +0
-1@@ -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},drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, · line 395
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +3
-3@@ -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); +DRM_DEV_DEBUG (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);
shouldn't this be dev_dbg for consistency?
Quoted 120 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0return 0 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +2
-2@@ -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 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1
-1@@ -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 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2
-2@@ -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:drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +4
-4@@ -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:drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size, · line 2599
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +2
-2@@ -2595,8 +2595,8 @@ void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint64_t vm_size,amdgpu_vm_set_fragment_size (adev, fragment_size_default);DRM_INFO ("vm size is %llu GB, block size is %u-bit, fragment size is %u-bit\n" , - adev->vm_manager.vm_size, adev->vm_manager.block_size, - adev->vm_manager.fragment_size); + adev->vm_manager.vm_size, adev->vm_manager.block_size, + adev->vm_manager.fragment_size);
Drop whitespace changes.
Quoted 305 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0}/** drivers/gpu/drm/amd/amdgpu/cik_sdma.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2
-2@@ -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",drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +2
-2@@ -2069,7 +2069,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);@@ -2349,7 +2349,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",drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-2@@ -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",drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-2@@ -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",drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/si_dma.c +2
-2@@ -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);drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +1
-1@@ -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",drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +1
-1@@ -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",drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +3
-3@@ -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:@@ -1010,7 +1010,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",drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +3
-3@@ -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:@@ -1198,7 +1198,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",drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1
-2@@ -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.9.5
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx