summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2010-01-29 15:55:30 +1000
committerDave Airlie <airlied@redhat.com>2010-02-01 10:12:26 +1000
commit43c33ed87d0f1b900a6a3014db556ecc7f4a989b (patch)
treeb8280b52b5965111e6673ab4bc699cefa3e588d3
parent97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0 (diff)
downloadlinux-3.10-43c33ed87d0f1b900a6a3014db556ecc7f4a989b.tar.gz
linux-3.10-43c33ed87d0f1b900a6a3014db556ecc7f4a989b.tar.bz2
linux-3.10-43c33ed87d0f1b900a6a3014db556ecc7f4a989b.zip
drm/radeon/kms: use active device to pick connector for encoder
On the W500 we have UNIPHY routed to both DVI and DP, this seems to always pick the DVI connector which means link training fails. Switch to using active device to pick the connector, this seems like it should be safe from a code review, and it fixes things a bit more here. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_encoders.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index 82eb551970b..10746c9c805 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -202,7 +202,7 @@ radeon_get_connector_for_encoder(struct drm_encoder *encoder)
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
radeon_connector = to_radeon_connector(connector);
- if (radeon_encoder->devices & radeon_connector->devices)
+ if (radeon_encoder->active_device & radeon_connector->devices)
return connector;
}
return NULL;