Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96687275 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Fix hotplug after s3 resume. 



On S3 resume the HPD6 irq source was not reenabled
due to loop boundary bug.

Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Reviewed-by: default avatarMikita Lipski <Mikita.Lipski@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a2b691f

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

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ int amdgpu_dm_irq_resume_early(struct amdgpu_device *adev) 
	DRM_DEBUG_KMS("DM_IRQ: early resume\n");



	/* re-enable short pulse interrupts HW interrupt */

	for (src = DC_IRQ_SOURCE_HPD1RX; src < DC_IRQ_SOURCE_HPD6RX + 1; src++) {

	for (src = DC_IRQ_SOURCE_HPD1RX; src <= DC_IRQ_SOURCE_HPD6RX + 1; src++) {

		hnd_list_l = &adev->dm.irq_handler_list_low_tab[src].head;

		hnd_list_h = &adev->dm.irq_handler_list_high_tab[src];

		if (!list_empty(hnd_list_l) || !list_empty(hnd_list_h))
@@ -488,7 +488,7 @@ int amdgpu_dm_irq_resume_late(struct amdgpu_device *adev) 
	 * Renable HW interrupt  for HPD and only since FLIP and VBLANK

	 * will be enabled from manage_dm_interrupts on enable CRTC.

	 */

	for (src = DC_IRQ_SOURCE_HPD1; src < DC_IRQ_SOURCE_HPD6; src++) {

	for (src = DC_IRQ_SOURCE_HPD1; src <= DC_IRQ_SOURCE_HPD6; src++) {

		hnd_list_l = &adev->dm.irq_handler_list_low_tab[src].head;

		hnd_list_h = &adev->dm.irq_handler_list_high_tab[src];

		if (!list_empty(hnd_list_l) || !list_empty(hnd_list_h))