Skip to content

Commit dbbaa73

Browse files
superm1gregkh
authored andcommitted
drm/amd/display: Pass up errors for reset GPU that fails to init HW
commit 2b6943d upstream. [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 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2700e35 commit dbbaa73

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

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

33453345
r = dm_dmub_hw_init(adev);
3346-
if (r)
3346+
if (r) {
33473347
drm_err(adev_to_drm(adev), "DMUB interface failed to initialize: status=%d\n", r);
3348+
return r;
3349+
}
33483350

33493351
dc_dmub_srv_set_power_state(dm->dc->ctx->dmub_srv, DC_ACPI_CM_POWER_STATE_D0);
33503352
dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0);

0 commit comments

Comments
 (0)