Skip to content

Commit 2b6943d

Browse files
superm1alexdeucher
authored andcommitted
drm/amd/display: Pass up errors for reset GPU that fails to init HW
[Why] If a GPU is in reset and the hardware fails to initialize the rest of the resume sequence shouldn't be run. [How] Pass error code up to caller of dm_resume(). Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Ivan Lipski <ivan.lipski@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent b174084 commit 2b6943d

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3398,8 +3398,10 @@ static int dm_resume(struct amdgpu_ip_block *ip_block)
33983398
link_enc_cfg_copy(adev->dm.dc->current_state, dc_state);
33993399

34003400
r = dm_dmub_hw_init(adev);
3401-
if (r)
3401+
if (r) {
34023402
drm_err(adev_to_drm(adev), "DMUB interface failed to initialize: status=%d\n", r);
3403+
return r;
3404+
}
34033405

34043406
dc_dmub_srv_set_power_state(dm->dc->ctx->dmub_srv, DC_ACPI_CM_POWER_STATE_D0);
34053407
dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0);

0 commit comments

Comments
 (0)