drm/amdgpu: Revert setting up Retry based Thrashing on GFX 12.1

Bug found with retry based thrashing mechanism. Revert to the old
thrashing method.

Signed-off-by: Sreekant Somasekharan <Sreekant.Somasekharan@amd.com>
Reviewed-by: Mukul Joshi <mukul.joshi@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
index 4e02b62cdbb334721fec367c5a55678a3296f8f2..6f2240f0ac5242b34040cca74222f78d0ac99f23 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c
@@ -2631,24 +2631,6 @@ static void gfx_v12_1_xcc_disable_gpa_mode(struct amdgpu_device *adev,
        WREG32_SOC15(GC, GET_INST(GC, xcc_id), regCPG_PSP_DEBUG, data);
 }
 
-static void gfx_v12_1_xcc_setup_tcp_thrashing_ctrl(struct amdgpu_device *adev,
-                                        int xcc_id)
-{
-       uint32_t val;
-
-       /* Set the TCP UTCL0 register to enable atomics */
-       val = RREG32_SOC15(GC, GET_INST(GC, xcc_id),
-                                       regTCP_UTCL0_THRASHING_CTRL);
-       val = REG_SET_FIELD(val, TCP_UTCL0_THRASHING_CTRL, THRASHING_EN, 0x2);
-       val = REG_SET_FIELD(val, TCP_UTCL0_THRASHING_CTRL,
-                                       RETRY_FRAGMENT_THRESHOLD_UP_EN, 0x1);
-       val = REG_SET_FIELD(val, TCP_UTCL0_THRASHING_CTRL,
-                                       RETRY_FRAGMENT_THRESHOLD_DOWN_EN, 0x1);
-
-       WREG32_SOC15(GC, GET_INST(GC, xcc_id),
-                                       regTCP_UTCL0_THRASHING_CTRL, val);
-}
-
 static void gfx_v12_1_xcc_enable_atomics(struct amdgpu_device *adev,
                                         int xcc_id)
 {
@@ -2697,7 +2679,6 @@ static void gfx_v12_1_init_golden_registers(struct amdgpu_device *adev)
        for (i = 0; i < NUM_XCC(adev->gfx.xcc_mask); i++) {
                gfx_v12_1_xcc_disable_burst(adev, i);
                gfx_v12_1_xcc_enable_atomics(adev, i);
-               gfx_v12_1_xcc_setup_tcp_thrashing_ctrl(adev, i);
                gfx_v12_1_xcc_disable_early_write_ack(adev, i);
                gfx_v12_1_xcc_disable_tcp_spill_cache(adev, i);
        }