Commit 2b6943df authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

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: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarIvan Lipski <ivan.lipski@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent b174084b

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

+3 −1
Original line number Diff line number Diff line
@@ -3398,8 +3398,10 @@ static int dm_resume(struct amdgpu_ip_block *ip_block) 
		link_enc_cfg_copy(adev->dm.dc->current_state, dc_state);



		r = dm_dmub_hw_init(adev);

		if (r)

		if (r) {

			drm_err(adev_to_drm(adev), "DMUB interface failed to initialize: status=%d\n", r);

			return r;

		}



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

		dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0);