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 <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 5f20b41bcb93a784ca2d505d3e91532f3c0847dd..ca37289c644ffeab3d0730aed85f553ff0e312b1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -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);