Commit 9b7d786b authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: only print meaningful VM faults 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f6be5e64

drivers/gpu/drm/radeon/cik.c

+4 −2
Original line number Diff line number Diff line
@@ -7676,14 +7676,16 @@ int cik_irq_process(struct radeon_device *rdev) 
			addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);

			status = RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS);

			mc_client = RREG32(VM_CONTEXT1_PROTECTION_FAULT_MCCLIENT);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			if (addr == 0x0 && status == 0x0)

				break;

			dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",

				addr);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

				status);

			cik_vm_decode_fault(rdev, status, addr, mc_client);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			break;

		case 167: /* VCE */

			DRM_DEBUG("IH: VCE int: 0x%08x\n", src_data);

drivers/gpu/drm/radeon/evergreen.c

+4 −2
Original line number Diff line number Diff line
@@ -5066,14 +5066,16 @@ int evergreen_irq_process(struct radeon_device *rdev) 
		case 147:

			addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);

			status = RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			if (addr == 0x0 && status == 0x0)

				break;

			dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",

				addr);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

				status);

			cayman_vm_decode_fault(rdev, status, addr);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			break;

		case 176: /* CP_INT in ring buffer */

		case 177: /* CP_INT in IB1 */

drivers/gpu/drm/radeon/si.c

+4 −2
Original line number Diff line number Diff line
@@ -6376,14 +6376,16 @@ int si_irq_process(struct radeon_device *rdev) 
		case 147:

			addr = RREG32(VM_CONTEXT1_PROTECTION_FAULT_ADDR);

			status = RREG32(VM_CONTEXT1_PROTECTION_FAULT_STATUS);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			if (addr == 0x0 && status == 0x0)

				break;

			dev_err(rdev->dev, "GPU fault detected: %d 0x%08x\n", src_id, src_data);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_ADDR   0x%08X\n",

				addr);

			dev_err(rdev->dev, "  VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x%08X\n",

				status);

			si_vm_decode_fault(rdev, status, addr);

			/* reset addr and status */

			WREG32_P(VM_CONTEXT1_CNTL2, 1, ~1);

			break;

		case 176: /* RINGID0 CP_INT */

			radeon_fence_process(rdev, RADEON_RING_TYPE_GFX_INDEX);