Commit 39fee32b authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher

drm/amdgpu: error out on mode1 reset failure

The error return value should be correctly reflected.
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fed184e9
...@@ -393,6 +393,7 @@ void soc15_program_register_sequence(struct amdgpu_device *adev, ...@@ -393,6 +393,7 @@ void soc15_program_register_sequence(struct amdgpu_device *adev,
static int soc15_asic_mode1_reset(struct amdgpu_device *adev) static int soc15_asic_mode1_reset(struct amdgpu_device *adev)
{ {
u32 i; u32 i;
int ret = 0;
amdgpu_atombios_scratch_regs_engine_hung(adev, true); amdgpu_atombios_scratch_regs_engine_hung(adev, true);
...@@ -403,7 +404,9 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ...@@ -403,7 +404,9 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)
pci_save_state(adev->pdev); pci_save_state(adev->pdev);
psp_gpu_reset(adev); ret = psp_gpu_reset(adev);
if (ret)
dev_err(adev->dev, "GPU mode1 reset failed\n");
pci_restore_state(adev->pdev); pci_restore_state(adev->pdev);
...@@ -418,7 +421,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ...@@ -418,7 +421,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)
amdgpu_atombios_scratch_regs_engine_hung(adev, false); amdgpu_atombios_scratch_regs_engine_hung(adev, false);
return 0; return ret;
} }
static int soc15_asic_get_baco_capability(struct amdgpu_device *adev, bool *cap) static int soc15_asic_get_baco_capability(struct amdgpu_device *adev, bool *cap)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment