drm/amdgpu: drop temp programming for pagefault handling
Subsystems (2)
PATCH 1/1 drm/amdgpu: drop temp programming for pagefault handling
Was introduced as workaround. not needed anymore
Signed-off-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 22 ---------------------- 1 file changed, 22 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c +0 -22
@@ -417,34 +417,12 @@ static void gfxhub_v3_0_set_fault_enable_default(struct amdgpu_device *adev, tmp =REG_SET_FIELD (tmp,CP_DEBUG ,CPG_UTCL1_ERROR_HALT_DISABLE ,1 );WREG32_SOC15 (GC ,0 , regCP_DEBUG, tmp); -/** -* Set GRBM_GFX_INDEX in broad cast mode -* before programming GL1C_UTCL0_CNTL1 and SQG_CONFIG -*/ -WREG32_SOC15 (GC ,0 , regGRBM_GFX_INDEX, regGRBM_GFX_INDEX_DEFAULT); - -/** -* Retry respond mode: RETRY -* Error (no retry) respond mode: SUCCESS -*/ - tmp =RREG32_SOC15 (GC ,0 , regGL1C_UTCL0_CNTL1); - tmp =REG_SET_FIELD (tmp,GL1C_UTCL0_CNTL1 ,RESP_MODE ,0 ); - tmp =REG_SET_FIELD (tmp,GL1C_UTCL0_CNTL1 ,RESP_FAULT_MODE ,0x2 ); -WREG32_SOC15 (GC ,0 , regGL1C_UTCL0_CNTL1, tmp); -/* These registers are not accessible to VF-SRIOV. * The PF will program them instead. */ if (amdgpu_sriov_vf (adev))return ; -/* Disable SQ XNACK interrupt for all VMIDs */ - tmp =RREG32_SOC15 (GC ,0 , regSQG_CONFIG); - tmp =REG_SET_FIELD (tmp,SQG_CONFIG ,XNACK_INTR_MASK , -SQG_CONFIG__XNACK_INTR_MASK_MASK >> -SQG_CONFIG__XNACK_INTR_MASK__SHIFT ); -WREG32_SOC15 (GC ,0 , regSQG_CONFIG, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGCVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value);
Signature · 1 line
2.34.1
[AMD Official Use Only - General]
Reviewed-by Jack Gui <[email protected]>
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Wednesday, April 12, 2023 10:02 PM
To: [email protected]; Gui, Jack <[email protected]>; Gao, Likun <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH] drm/amdgpu: drop temp programming for pagefault handling
Was introduced as workaround. not needed anymore
Signed-off-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 22 ---------------------- 1 file changed, 22 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c +0 -22
@@ -417,34 +417,12 @@ static void gfxhub_v3_0_set_fault_enable_default(struct amdgpu_device *adev, tmp =REG_SET_FIELD (tmp,CP_DEBUG ,CPG_UTCL1_ERROR_HALT_DISABLE ,1 );WREG32_SOC15 (GC ,0 , regCP_DEBUG, tmp); -/** -* Set GRBM_GFX_INDEX in broad cast mode -* before programming GL1C_UTCL0_CNTL1 and SQG_CONFIG -*/ -WREG32_SOC15 (GC ,0 , regGRBM_GFX_INDEX, regGRBM_GFX_INDEX_DEFAULT); - -/** -* Retry respond mode: RETRY -* Error (no retry) respond mode: SUCCESS -*/ - tmp =RREG32_SOC15 (GC ,0 , regGL1C_UTCL0_CNTL1); - tmp =REG_SET_FIELD (tmp,GL1C_UTCL0_CNTL1 ,RESP_MODE ,0 ); - tmp =REG_SET_FIELD (tmp,GL1C_UTCL0_CNTL1 ,RESP_FAULT_MODE ,0x2 ); -WREG32_SOC15 (GC ,0 , regGL1C_UTCL0_CNTL1, tmp); -/* These registers are not accessible to VF-SRIOV. * The PF will program them instead. */ if (amdgpu_sriov_vf (adev))return ; -/* Disable SQ XNACK interrupt for all VMIDs */ - tmp =RREG32_SOC15 (GC ,0 , regSQG_CONFIG); - tmp =REG_SET_FIELD (tmp,SQG_CONFIG ,XNACK_INTR_MASK , -SQG_CONFIG__XNACK_INTR_MASK_MASK >> -SQG_CONFIG__XNACK_INTR_MASK__SHIFT ); -WREG32_SOC15 (GC ,0 , regSQG_CONFIG, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGCVM_L2_PROTECTION_FAULT_CNTL); tmp =REG_SET_FIELD (tmp,GCVM_L2_PROTECTION_FAULT_CNTL ,RANGE_PROTECTION_FAULT_ENABLE_DEFAULT , value);
Signature · 1 line
2.34.1