diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-08-09 17:09:06 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-17 10:55:54 -0700 |
| commit | cdc0fbfac92e20e64737ec0648f38be03d5a29d3 (patch) | |
| tree | 7b9cae75e3a9665a6b7c9deba44d693a40ccee1a /drivers/gpu | |
| parent | 3438bc96d02ea314a04759e435e50b5b6177f88c (diff) | |
| download | kernel_samsung_smdk4412-cdc0fbfac92e20e64737ec0648f38be03d5a29d3.tar.gz kernel_samsung_smdk4412-cdc0fbfac92e20e64737ec0648f38be03d5a29d3.tar.bz2 kernel_samsung_smdk4412-cdc0fbfac92e20e64737ec0648f38be03d5a29d3.zip | |
drm/radeon/kms: don't enable connectors that are off in the hotplug handler
commit 73104b5cfe3067d68f2c2de3f3d4d4964c55873e upstream.
If we get a hotplug event on an connector that is off, don't
attempt to turn it on or off, it should already be off.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=728228
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 6d6b5f16bc0..519b5e2f1ee 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -60,6 +60,10 @@ void radeon_connector_hotplug(struct drm_connector *connector) radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd); + /* if the connector is already off, don't turn it back on */ + if (connector->dpms != DRM_MODE_DPMS_ON) + return; + /* powering up/down the eDP panel generates hpd events which * can interfere with modesetting. */ |