diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-05-20 04:34:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-20 20:02:34 +1000 |
| commit | 7c3ed0fd9b72d489243ff97f3cea2e1d4d07d9fa (patch) | |
| tree | 10c463e991478c003146873ede0329c5b8bf1a03 /drivers/gpu/drm | |
| parent | 1e85e1d07b9255bd52c557f1a77fb72ccfacaf1c (diff) | |
| download | kernel_samsung_aries-7c3ed0fd9b72d489243ff97f3cea2e1d4d07d9fa.zip kernel_samsung_aries-7c3ed0fd9b72d489243ff97f3cea2e1d4d07d9fa.tar.gz kernel_samsung_aries-7c3ed0fd9b72d489243ff97f3cea2e1d4d07d9fa.tar.bz2 | |
drm/radeon/kms: bail early for eDP in hotplug callback
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>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 6 |
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 5947871..532f17d 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)) |