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

drm/amd/display: Fix HPD after gpu reset 



[Why]
DC is not using amdgpu_irq_get/put to manage the HPD interrupt refcounts.
So when amdgpu_irq_gpu_reset_resume_helper() reprograms all of the IRQs,
HPD gets disabled.

[How]
Use amdgpu_irq_get/put() for HPD init/fini in DM in order to sync refcounts

Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Signed-off-by: default avatarZaeem Mohamed <zaeem.mohamed@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit f3dde2ff)
Cc: stable@vger.kernel.org
parent b5f7242e

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

+14 −0
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev) 
	struct drm_device *dev = adev_to_drm(adev);

	struct drm_connector *connector;

	struct drm_connector_list_iter iter;

	int i;



	drm_connector_list_iter_begin(dev, &iter);

	drm_for_each_connector_iter(connector, &iter) {
@@ -920,6 +921,12 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev) 
		}

	}

	drm_connector_list_iter_end(&iter);



	/* Update reference counts for HPDs */

	for (i = DC_IRQ_SOURCE_HPD1; i <= adev->mode_info.num_hpd; i++) {

		if (amdgpu_irq_get(adev, &adev->hpd_irq, i - DC_IRQ_SOURCE_HPD1))

			drm_err(dev, "DM_IRQ: Failed get HPD for source=%d)!\n", i);

	}

}



/**
@@ -935,6 +942,7 @@ void amdgpu_dm_hpd_fini(struct amdgpu_device *adev) 
	struct drm_device *dev = adev_to_drm(adev);

	struct drm_connector *connector;

	struct drm_connector_list_iter iter;

	int i;



	drm_connector_list_iter_begin(dev, &iter);

	drm_for_each_connector_iter(connector, &iter) {
@@ -960,4 +968,10 @@ void amdgpu_dm_hpd_fini(struct amdgpu_device *adev) 
		}

	}

	drm_connector_list_iter_end(&iter);



	/* Update reference counts for HPDs */

	for (i = DC_IRQ_SOURCE_HPD1; i <= adev->mode_info.num_hpd; i++) {

		if (amdgpu_irq_put(adev, &adev->hpd_irq, i - DC_IRQ_SOURCE_HPD1))

			drm_err(dev, "DM_IRQ: Failed put HPD for source=%d!\n", i);

	}

}