Skip to content

Commit 66f92d1

Browse files
ethancedwards8alexdeucher
authored andcommitted
drm/amdgpu/gfx9.4.3: remove redundant repeated nested 0 check
The repeated checks on grbm_soft_reset are unnecessary. Remove them. Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 90e1d03 commit 66f92d1

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2461,19 +2461,17 @@ static int gfx_v9_4_3_soft_reset(struct amdgpu_ip_block *ip_block)
24612461
/* Disable MEC parsing/prefetching */
24622462
gfx_v9_4_3_xcc_cp_compute_enable(adev, false, 0);
24632463

2464-
if (grbm_soft_reset) {
2465-
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
2466-
tmp |= grbm_soft_reset;
2467-
dev_info(adev->dev, "GRBM_SOFT_RESET=0x%08X\n", tmp);
2468-
WREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET, tmp);
2469-
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
2470-
2471-
udelay(50);
2472-
2473-
tmp &= ~grbm_soft_reset;
2474-
WREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET, tmp);
2475-
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
2476-
}
2464+
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
2465+
tmp |= grbm_soft_reset;
2466+
dev_info(adev->dev, "GRBM_SOFT_RESET=0x%08X\n", tmp);
2467+
WREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET, tmp);
2468+
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
2469+
2470+
udelay(50);
2471+
2472+
tmp &= ~grbm_soft_reset;
2473+
WREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET, tmp);
2474+
tmp = RREG32_SOC15(GC, GET_INST(GC, 0), regGRBM_SOFT_RESET);
24772475

24782476
/* Wait a little for things to settle down */
24792477
udelay(50);

0 commit comments

Comments
 (0)