drm/amdgpu/si: minor clean up of reset code

Drop duplicate reset method logging, whitespace changes.

Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 3cf0589bfea5e4ecf5bbf44b2701d0773a908ceb..75422764b2d3b9f8d56d49861083adf561b78a35 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -1270,7 +1270,7 @@ static int si_gpu_pci_config_reset(struct amdgpu_device *adev)
        u32 i;
        int r = -EINVAL;
 
-       dev_info(adev->dev, "GPU pci config reset\n");
+       amdgpu_atombios_scratch_regs_engine_hung(adev, true);
 
        /* set mclk/sclk to bypass */
        si_set_clk_bypass_mode(adev);
@@ -1294,6 +1294,7 @@ static int si_gpu_pci_config_reset(struct amdgpu_device *adev)
                }
                udelay(1);
        }
+       amdgpu_atombios_scratch_regs_engine_hung(adev, false);
 
        return r;
 }
@@ -1304,12 +1305,8 @@ static int si_asic_reset(struct amdgpu_device *adev)
 
        dev_info(adev->dev, "PCI CONFIG reset\n");
 
-       amdgpu_atombios_scratch_regs_engine_hung(adev, true);
-
        r = si_gpu_pci_config_reset(adev);
 
-       amdgpu_atombios_scratch_regs_engine_hung(adev, false);
-
        return r;
 }