moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Drop duplicate reset method logging, whitespace changes.

Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2021-02-04 10:31:38 -05:00
parent ae07970a06
commit 25bd55276b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/amdgpu/si.c
View File

@@ -1270,7 +1270,7 @@ static int si_gpu_pci_config_reset(struct amdgpu_device *adev)
u32 i; u32 i;
int r = -EINVAL; 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 */ /* set mclk/sclk to bypass */
si_set_clk_bypass_mode(adev); si_set_clk_bypass_mode(adev);
@@ -1294,6 +1294,7 @@ static int si_gpu_pci_config_reset(struct amdgpu_device *adev)
} }
udelay(1); udelay(1);
} }
amdgpu_atombios_scratch_regs_engine_hung(adev, false);
return r; return r;
} }
@@ -1304,12 +1305,8 @@ static int si_asic_reset(struct amdgpu_device *adev)
dev_info(adev->dev, "PCI CONFIG reset\n"); dev_info(adev->dev, "PCI CONFIG reset\n");
amdgpu_atombios_scratch_regs_engine_hung(adev, true);
r = si_gpu_pci_config_reset(adev); r = si_gpu_pci_config_reset(adev);
amdgpu_atombios_scratch_regs_engine_hung(adev, false);
return r; return r;
} }