drm/amdgpu: delete duplicate condition in gfx_v11_0_soft_reset()
Subsystems (3)
PATCH 1/1 drm/amdgpu: delete duplicate condition in gfx_v11_0_soft_reset()
We know that "grbm_soft_reset" is true because we're already inside an if (grbm_soft_reset) condition. No need to test again.
Signed-off-by Dan Carpenter <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +11 -13
@@ -4780,19 +4780,17 @@ static int gfx_v11_0_soft_reset(void *handle)/* Disable MEC parsing/prefetching */ gfx_v11_0_cp_compute_enable (adev, false); -if (grbm_soft_reset) { - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - tmp |= grbm_soft_reset; -dev_info (adev->dev,"GRBM_SOFT_RESET=0x%08X\n" , tmp); -WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - -udelay (50 ); - - tmp &= ~grbm_soft_reset; -WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - } + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); + tmp |= grbm_soft_reset; +dev_info (adev->dev,"GRBM_SOFT_RESET=0x%08X\n" , tmp); +WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); + +udelay (50 ); + + tmp &= ~grbm_soft_reset; +WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET);/* Wait a little for things to settle down */ udelay (50 );
Signature · 1 line
2.35.1
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 47 lines · Dan Carpenter
We know that "
grbm_soft_reset" is true because we're already inside an if (grbm_soft_reset) condition. No need to test again.Signed-off-by Dan Carpenter <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +11
-14@@ -4780,19 +4780,17 @@ static int gfx_v11_0_soft_reset(void *handle)/* Disable MEC parsing/prefetching */ gfx_v11_0_cp_compute_enable (adev, false); -if (grbm_soft_reset) { - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - tmp |= grbm_soft_reset; -dev_info (adev->dev,"GRBM_SOFT_RESET=0x%08X\n" , tmp); -WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - -udelay (50 ); - - tmp &= ~grbm_soft_reset; -WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); - tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); - } + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); + tmp |= grbm_soft_reset; +dev_info (adev->dev,"GRBM_SOFT_RESET=0x%08X\n" , tmp); +WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET); + +udelay (50 ); + + tmp &= ~grbm_soft_reset; +WREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET, tmp); + tmp =RREG32_SOC15 (GC ,0 , regGRBM_SOFT_RESET);/* Wait a little for things to settle down */ udelay (50 ); --2.35.1