Commit 7cae7061 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdgpu: Disable retry faults in VMID0 



There is no point retrying page faults in VMID0. Those faults are
always fatal.

Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-and-Tested-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4e66d7d2

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

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ static void gfxhub_v1_0_enable_system_domain(struct amdgpu_device *adev) 
	tmp = RREG32_SOC15(GC, 0, mmVM_CONTEXT0_CNTL);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL, ENABLE_CONTEXT, 1);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL, PAGE_TABLE_DEPTH, 0);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL,

			    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);

	WREG32_SOC15(GC, 0, mmVM_CONTEXT0_CNTL, tmp);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ static void gfxhub_v2_0_enable_system_domain(struct amdgpu_device *adev) 
	tmp = RREG32_SOC15(GC, 0, mmGCVM_CONTEXT0_CNTL);

	tmp = REG_SET_FIELD(tmp, GCVM_CONTEXT0_CNTL, ENABLE_CONTEXT, 1);

	tmp = REG_SET_FIELD(tmp, GCVM_CONTEXT0_CNTL, PAGE_TABLE_DEPTH, 0);

	tmp = REG_SET_FIELD(tmp, GCVM_CONTEXT0_CNTL,

			    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);

	WREG32_SOC15(GC, 0, mmGCVM_CONTEXT0_CNTL, tmp);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -207,6 +207,8 @@ static void mmhub_v1_0_enable_system_domain(struct amdgpu_device *adev) 
	tmp = RREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_CNTL);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL, ENABLE_CONTEXT, 1);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL, PAGE_TABLE_DEPTH, 0);

	tmp = REG_SET_FIELD(tmp, VM_CONTEXT0_CNTL,

			    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);

	WREG32_SOC15(MMHUB, 0, mmVM_CONTEXT0_CNTL, tmp);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ static void mmhub_v2_0_enable_system_domain(struct amdgpu_device *adev) 
	tmp = RREG32_SOC15(MMHUB, 0, mmMMVM_CONTEXT0_CNTL);

	tmp = REG_SET_FIELD(tmp, MMVM_CONTEXT0_CNTL, ENABLE_CONTEXT, 1);

	tmp = REG_SET_FIELD(tmp, MMVM_CONTEXT0_CNTL, PAGE_TABLE_DEPTH, 0);

	tmp = REG_SET_FIELD(tmp, MMVM_CONTEXT0_CNTL,

			    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);

	WREG32_SOC15(MMHUB, 0, mmMMVM_CONTEXT0_CNTL, tmp);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ static void mmhub_v9_4_enable_system_domain(struct amdgpu_device *adev, 
				  hubid * MMHUB_INSTANCE_REGISTER_OFFSET);

	tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT0_CNTL, ENABLE_CONTEXT, 1);

	tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT0_CNTL, PAGE_TABLE_DEPTH, 0);

	tmp = REG_SET_FIELD(tmp, VML2VC0_VM_CONTEXT0_CNTL,

			    RETRY_PERMISSION_OR_INVALID_PAGE_FAULT, 0);

	WREG32_SOC15_OFFSET(MMHUB, 0, mmVML2VC0_VM_CONTEXT0_CNTL,

			    hubid * MMHUB_INSTANCE_REGISTER_OFFSET, tmp);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE