From: Alex Deucher Date: Thu, 4 Feb 2021 15:31:38 +0000 (-0500) Subject: drm/amdgpu/si: minor clean up of reset code X-Git-Tag: baikal/aarch64/sdk6.1~7223^2~1^2~35 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=5b32c425faedb44f46008a44192550c7992a4e6e;p=kernel.git drm/amdgpu/si: minor clean up of reset code Drop duplicate reset method logging, whitespace changes. Acked-by: Evan Quan Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c index 3cf0589bfea5e..75422764b2d3b 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; }