Commit 4bd9a67e authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu:halt when vm fault 



only with this way we can debug the VMC page fault issue

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e6d92197

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c

+6 −0
Original line number Diff line number Diff line
@@ -319,6 +319,12 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, 
			WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value);

	tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

			EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT, value);

	if (!value) {

		tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

				CRASH_ON_NO_RETRY_FAULT, 1);

		tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

				CRASH_ON_RETRY_FAULT, 1);

    }

	WREG32_SOC15(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL, tmp);

}

drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c

+7 −0
Original line number Diff line number Diff line
@@ -561,6 +561,13 @@ void mmhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, bool value) 
			WRITE_PROTECTION_FAULT_ENABLE_DEFAULT, value);

	tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

			EXECUTE_PROTECTION_FAULT_ENABLE_DEFAULT, value);

	if (!value) {

		tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

				CRASH_ON_NO_RETRY_FAULT, 1);

		tmp = REG_SET_FIELD(tmp, VM_L2_PROTECTION_FAULT_CNTL,

				CRASH_ON_RETRY_FAULT, 1);

    }



	WREG32_SOC15(MMHUB, 0, mmVM_L2_PROTECTION_FAULT_CNTL, tmp);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE