1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 5947871e1062..532f17d39e1c 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -52,6 +52,12 @@ void radeon_connector_hotplug(struct drm_connector *connector)
 
         radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
 
+        /* powering up/down the eDP panel generates hpd events which
+         * can interfere with modesetting.
+         */
+        if (connector->connector_type == DRM_MODE_CONNECTOR_eDP)
+                return;
+
         /* pre-r600 did not always have the hpd pins mapped accurately to connectors */
         if (rdev->family >= CHIP_R600) {
                 if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd))