diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2012-05-04 11:06:22 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-17 11:43:50 +0100 |
| commit | 455c89b9572e16cc0d60bdc1d62ad81e615d1ddd (patch) | |
| tree | bc25161547f91d9e2b726280993a0faba23527a3 /drivers/gpu/drm/radeon/r600.c | |
| parent | 10f5ab04056207b900e903f1e4b50b8e3867b67e (diff) | |
| download | blackbird-op-linux-455c89b9572e16cc0d60bdc1d62ad81e615d1ddd.tar.gz blackbird-op-linux-455c89b9572e16cc0d60bdc1d62ad81e615d1ddd.zip | |
drm/radeon: don't mess with hot plug detect for eDP or LVDS connector v2
It seems imac pannel doesn't like whe we change the hot plug setup
and then refuse to work. This help but doesn't fully fix:
https://bugzilla.redhat.com/show_bug.cgi?id=726143
v2: fix typo and improve commit message
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 4c0d8c96a0ec..d2a536d788e9 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -713,6 +713,14 @@ void r600_hpd_init(struct radeon_device *rdev) list_for_each_entry(connector, &dev->mode_config.connector_list, head) { struct radeon_connector *radeon_connector = to_radeon_connector(connector); + if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type == DRM_MODE_CONNECTOR_LVDS) { + /* don't try to enable hpd on eDP or LVDS avoid breaking the + * aux dp channel on imac and help (but not completely fix) + * https://bugzilla.redhat.com/show_bug.cgi?id=726143 + */ + continue; + } if (ASIC_IS_DCE3(rdev)) { u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) | DC_HPDx_RX_INT_TIMER(0xfa); if (ASIC_IS_DCE32(rdev)) |
