Skip to content

Commit 73c4b0f

Browse files
Hawking Zhangalexdeucher
authored andcommitted
drm/amdgpu: drop temp programming for pagefault handling
Was introduced as workaround. not needed anymore Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: Jack Gui <Jack.Gui@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent ff742e0 commit 73c4b0f

1 file changed

Lines changed: 0 additions & 22 deletions

File tree

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -417,34 +417,12 @@ static void gfxhub_v3_0_set_fault_enable_default(struct amdgpu_device *adev,
417417
tmp = REG_SET_FIELD(tmp, CP_DEBUG, CPG_UTCL1_ERROR_HALT_DISABLE, 1);
418418
WREG32_SOC15(GC, 0, regCP_DEBUG, tmp);
419419

420-
/**
421-
* Set GRBM_GFX_INDEX in broad cast mode
422-
* before programming GL1C_UTCL0_CNTL1 and SQG_CONFIG
423-
*/
424-
WREG32_SOC15(GC, 0, regGRBM_GFX_INDEX, regGRBM_GFX_INDEX_DEFAULT);
425-
426-
/**
427-
* Retry respond mode: RETRY
428-
* Error (no retry) respond mode: SUCCESS
429-
*/
430-
tmp = RREG32_SOC15(GC, 0, regGL1C_UTCL0_CNTL1);
431-
tmp = REG_SET_FIELD(tmp, GL1C_UTCL0_CNTL1, RESP_MODE, 0);
432-
tmp = REG_SET_FIELD(tmp, GL1C_UTCL0_CNTL1, RESP_FAULT_MODE, 0x2);
433-
WREG32_SOC15(GC, 0, regGL1C_UTCL0_CNTL1, tmp);
434-
435420
/* These registers are not accessible to VF-SRIOV.
436421
* The PF will program them instead.
437422
*/
438423
if (amdgpu_sriov_vf(adev))
439424
return;
440425

441-
/* Disable SQ XNACK interrupt for all VMIDs */
442-
tmp = RREG32_SOC15(GC, 0, regSQG_CONFIG);
443-
tmp = REG_SET_FIELD(tmp, SQG_CONFIG, XNACK_INTR_MASK,
444-
SQG_CONFIG__XNACK_INTR_MASK_MASK >>
445-
SQG_CONFIG__XNACK_INTR_MASK__SHIFT);
446-
WREG32_SOC15(GC, 0, regSQG_CONFIG, tmp);
447-
448426
tmp = RREG32_SOC15(GC, 0, regGCVM_L2_PROTECTION_FAULT_CNTL);
449427
tmp = REG_SET_FIELD(tmp, GCVM_L2_PROTECTION_FAULT_CNTL,
450428
RANGE_PROTECTION_FAULT_ENABLE_DEFAULT, value);

0 commit comments

Comments
 (0)