diff options
| author | Felix Kuehling <Felix.Kuehling@amd.com> | 2017-03-28 13:42:31 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-03-29 23:55:47 -0400 |
| commit | 4d6cbde37aac29164193df6d55c3685f223c1f9e (patch) | |
| tree | 6cec041bb95448a68d7670b036020d75b0f9fab4 /drivers/gpu/drm/amd | |
| parent | d7c434d36775b64ef6a92cce76707972e1c1b748 (diff) | |
| download | op-kernel-dev-4d6cbde37aac29164193df6d55c3685f223c1f9e.zip op-kernel-dev-4d6cbde37aac29164193df6d55c3685f223c1f9e.tar.gz | |
drm/amdgpu: Clean up GFX 9 VM fault messages
Clean up the VM fault message format and use rate-limiting similar
to other ASICs.
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 981d3d9..1e4734d 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -131,7 +131,7 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, { struct amdgpu_vmhub *gfxhub = &adev->vmhub[AMDGPU_GFXHUB]; struct amdgpu_vmhub *mmhub = &adev->vmhub[AMDGPU_MMHUB]; - uint32_t status; + uint32_t status = 0; u64 addr; addr = (u64)entry->src_data[0] << 12; @@ -145,19 +145,20 @@ static int gmc_v9_0_process_interrupt(struct amdgpu_device *adev, status = RREG32(gfxhub->vm_l2_pro_fault_status); WREG32_P(gfxhub->vm_l2_pro_fault_cntl, 1, ~1); } + } - DRM_ERROR("[%s]VMC page fault (src_id:%u ring:%u vm_id:%u pas_id:%u) " - "at page 0x%016llx from %d\n" - "VM_L2_PROTECTION_FAULT_STATUS:0x%08X\n", - entry->vm_id_src ? "mmhub" : "gfxhub", - entry->src_id, entry->ring_id, entry->vm_id, entry->pas_id, - addr, entry->client_id, status); - } else { - DRM_ERROR("[%s]VMC page fault (src_id:%u ring:%u vm_id:%u pas_id:%u) " - "at page 0x%016llx from %d\n", - entry->vm_id_src ? "mmhub" : "gfxhub", - entry->src_id, entry->ring_id, entry->vm_id, entry->pas_id, - addr, entry->client_id); + if (printk_ratelimit()) { + dev_err(adev->dev, + "[%s] VMC page fault (src_id:%u ring:%u vm_id:%u pas_id:%u)\n", + entry->vm_id_src ? "mmhub" : "gfxhub", + entry->src_id, entry->ring_id, entry->vm_id, + entry->pas_id); + dev_err(adev->dev, " at page 0x%016llx from %d\n", + addr, entry->client_id); + if (!amdgpu_sriov_vf(adev)) + dev_err(adev->dev, + "VM_L2_PROTECTION_FAULT_STATUS:0x%08X\n", + status); } return 0; |
