Drop duplicate reset method logging, whitespace changes.
Signed-off-by: Alex Deucher <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/si.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 7817e5156cb5..668dd6dfe6a3 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -1380,7 +1380,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);
@@ -1404,6 +1404,7 @@ static int si_gpu_pci_config_reset(struct amdgpu_device
*adev)
}
udelay(1);
}
+ amdgpu_atombios_scratch_regs_engine_hung(adev, false);
return r;
}
@@ -1414,12 +1415,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;
}
--
2.29.2
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
