drm/amdgpu/dce10: disable hpd on local panels

Otherwise we can get a hotplug interrupt storm when
we turn the panel off if hpd interrupts were enabled
by the bios.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=97471

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
index 9a63d7766604..55e346e0d1dc 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
@@ -427,16 +427,6 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev)
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
                 struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
 
-                if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
-                    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
-                        /* don't try to enable hpd on eDP or LVDS avoid breaking the
-                         * aux dp channel on imac and help (but not completely fix)
-                         * https://bugzilla.redhat.com/show_bug.cgi?id=726143
-                         * also avoid interrupt storms during dpms.
-                         */
-                        continue;
-                }
-
                 switch (amdgpu_connector->hpd.hpd) {
                 case AMDGPU_HPD_1:
                         idx = 0;
@@ -460,6 +450,19 @@ static void dce_v10_0_hpd_init(struct amdgpu_device *adev)
                         continue;
                 }
 
+                if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
+                    connector->connector_type == DRM_MODE_CONNECTOR_LVDS) {
+                        /* don't try to enable hpd on eDP or LVDS avoid breaking the
+                         * aux dp channel on imac and help (but not completely fix)
+                         * https://bugzilla.redhat.com/show_bug.cgi?id=726143
+                         * also avoid interrupt storms during dpms.
+                         */
+                        tmp = RREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx]);
+                        tmp = REG_SET_FIELD(tmp, DC_HPD_INT_CONTROL, DC_HPD_INT_EN, 0);
+                        WREG32(mmDC_HPD_INT_CONTROL + hpd_offsets[idx], tmp);
+                        continue;
+                }
+
                 tmp = RREG32(mmDC_HPD_CONTROL + hpd_offsets[idx]);
                 tmp = REG_SET_FIELD(tmp, DC_HPD_CONTROL, DC_HPD_EN, 1);
                 WREG32(mmDC_HPD_CONTROL + hpd_offsets[idx], tmp);