diff options
author | Alex Deucher | 2013-04-11 11:45:34 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-05-11 15:54:06 -0500 |
commit | 92f3345933a597abab9112d0127c29b9f4535b9a (patch) | |
tree | 86db0a1aad76b34022dda9c0a30338b231940360 | |
parent | 49b4bf2625c2cec64f1277436b36cc7cd546b174 (diff) | |
download | kernel-omap-92f3345933a597abab9112d0127c29b9f4535b9a.tar.gz kernel-omap-92f3345933a597abab9112d0127c29b9f4535b9a.tar.xz kernel-omap-92f3345933a597abab9112d0127c29b9f4535b9a.zip |
drm/radeon/evergreen+: don't enable HPD interrupts on eDP/LVDS
commit 2e97be73e5f74a317232740ae82eb8f95326a660 upstream.
Avoids potential interrupt storms when the display is disabled.
May fix:
https://bugzilla.kernel.org/show_bug.cgi?id=56041
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 4078f25fad72..90dc47076620 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -636,6 +636,16 @@ void evergreen_hpd_init(struct radeon_device *rdev) | |||
636 | 636 | ||
637 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { | 637 | list_for_each_entry(connector, &dev->mode_config.connector_list, head) { |
638 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); | 638 | struct radeon_connector *radeon_connector = to_radeon_connector(connector); |
639 | |||
640 | if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || | ||
641 | connector->connector_type == DRM_MODE_CONNECTOR_LVDS) { | ||
642 | /* don't try to enable hpd on eDP or LVDS avoid breaking the | ||
643 | * aux dp channel on imac and help (but not completely fix) | ||
644 | * https://bugzilla.redhat.com/show_bug.cgi?id=726143 | ||
645 | * also avoid interrupt storms during dpms. | ||
646 | */ | ||
647 | continue; | ||
648 | } | ||
639 | switch (radeon_connector->hpd.hpd) { | 649 | switch (radeon_connector->hpd.hpd) { |
640 | case RADEON_HPD_1: | 650 | case RADEON_HPD_1: |
641 | WREG32(DC_HPD1_CONTROL, tmp); | 651 | WREG32(DC_HPD1_CONTROL, tmp); |