diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-05-20 04:34:30 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-20 06:02:34 -0400 |
| commit | 7c3ed0fd9b72d489243ff97f3cea2e1d4d07d9fa (patch) | |
| tree | 10c463e991478c003146873ede0329c5b8bf1a03 | |
| parent | 1e85e1d07b9255bd52c557f1a77fb72ccfacaf1c (diff) | |
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>
| -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 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) | |||
| 52 | 52 | ||
| 53 | radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); | 53 | radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); |
| 54 | 54 | ||
| 55 | /* powering up/down the eDP panel generates hpd events which | ||
| 56 | * can interfere with modesetting. | ||
| 57 | */ | ||
| 58 | if (connector->connector_type == DRM_MODE_CONNECTOR_eDP) | ||
| 59 | return; | ||
| 60 | |||
| 55 | /* pre-r600 did not always have the hpd pins mapped accurately to connectors */ | 61 | /* pre-r600 did not always have the hpd pins mapped accurately to connectors */ |
| 56 | if (rdev->family >= CHIP_R600) { | 62 | if (rdev->family >= CHIP_R600) { |
| 57 | if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) | 63 | if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd)) |
