drm/radeon/kms: bail early for eDP in hotplug callback
authorAlex Deucher <alexdeucher@gmail.com>
Fri, 20 May 2011 08:34:30 +0000 (04:34 -0400)
committerDave Airlie <airlied@redhat.com>
Fri, 20 May 2011 10:02:34 +0000 (20:02 +1000)
Don't try and en/disable the port as it may be a hpd event from
powering up/down the panel during a modeset or dpms.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_connectors.c

index 5947871e10623d7a0b71a9229d4a00a7a75f16a2..532f17d39e1c4f1b006d6c738dae3a7f8cc150b7 100644 (file)
@@ -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))