aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-11-02 01:26:48 -0400
committerDave Airlie <airlied@redhat.com>2010-11-08 22:37:47 -0500
commita0ae5864d42b41c411368bd689462bf063c029c8 (patch)
treec8a450cdf031f9d3b2450994451c2938ca1c716a
parentfce7d61be01ad7606056608be08fef15b70eeb84 (diff)
drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
The A/B links aren't independantly useable on these blocks so when we disable the encoders, make sure to only disable the encoder when there is no connector using it. Should fix: https://bugs.freedesktop.org/show_bug.cgi?id=18564 Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Cc: stable@kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_encoders.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index ae58b6849a2e..b862be61c398 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -1547,6 +1547,23 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
1547 struct radeon_device *rdev = dev->dev_private; 1547 struct radeon_device *rdev = dev->dev_private;
1548 struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); 1548 struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
1549 struct radeon_encoder_atom_dig *dig; 1549 struct radeon_encoder_atom_dig *dig;
1550
1551 /* check for pre-DCE3 cards with shared encoders;
1552 * can't really use the links individually, so don't disable
1553 * the encoder if it's in use by another connector
1554 */
1555 if (!ASIC_IS_DCE3(rdev)) {
1556 struct drm_encoder *other_encoder;
1557 struct radeon_encoder *other_radeon_encoder;
1558
1559 list_for_each_entry(other_encoder, &dev->mode_config.encoder_list, head) {
1560 other_radeon_encoder = to_radeon_encoder(other_encoder);
1561 if ((radeon_encoder->encoder_id == other_radeon_encoder->encoder_id) &&
1562 drm_helper_encoder_in_use(other_encoder))
1563 goto disable_done;
1564 }
1565 }
1566
1550 radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); 1567 radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF);
1551 1568
1552 switch (radeon_encoder->encoder_id) { 1569 switch (radeon_encoder->encoder_id) {
@@ -1586,6 +1603,7 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder)
1586 break; 1603 break;
1587 } 1604 }
1588 1605
1606disable_done:
1589 if (radeon_encoder_is_digital(encoder)) { 1607 if (radeon_encoder_is_digital(encoder)) {
1590 if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) 1608 if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI)
1591 r600_hdmi_disable(encoder); 1609 r600_hdmi_disable(encoder);