diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2021-02-04 10:31:38 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2021-02-09 15:29:40 -0500 |
| commit | 25bd55276b5ab4d27312749849cae42415eebfb5 (patch) | |
| tree | 7d55d0744bff8af2c9788af5bd3a4187e31ce1ed /drivers/gpu/drm/amd/amdgpu/si.c | |
| parent | ae07970a0621d67a8bc0dc5b44e3fc652bd2ba20 (diff) | |
| download | linux-25bd55276b5ab4d27312749849cae42415eebfb5.tar.gz linux-25bd55276b5ab4d27312749849cae42415eebfb5.tar.bz2 linux-25bd55276b5ab4d27312749849cae42415eebfb5.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/si.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/si.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 3cf0589bfea5..75422764b2d3 100644 --- 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; } |