summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2010-01-14 11:21:33 +1000
committerDave Airlie <airlied@redhat.com>2010-01-14 11:21:33 +1000
commit3d158716a60d5a113a541ea2f680b81a1be41ad2 (patch)
treea2472b34c37f3c9a0362817e0d48bf5293e84263
parent6a363f68415d37c302151581f2a86855dba39b67 (diff)
displayport: fix DDC on DVI->DP convertors.
Seems we have to not do auxch DDC if we aren't talking to a DP sink.
-rw-r--r--src/radeon_output.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index a16f7fc5..04817e30 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -308,7 +308,11 @@ radeon_ddc_connected(xf86OutputPtr output)
*MonInfo = *radeon_output->custom_mon;
} else if ((radeon_output->ConnectorType == CONNECTOR_DISPLAY_PORT) ||
(radeon_output->ConnectorType == CONNECTOR_EDP)) {
- MonInfo = xf86OutputGetEDID(output, radeon_output->dp_pI2CBus);
+ ret = RADEON_DP_GetSinkType(output);
+ if (ret == CONNECTOR_OBJECT_ID_DISPLAYPORT ||
+ ret == CONNECTOR_OBJECT_ID_eDP) {
+ MonInfo = xf86OutputGetEDID(output, radeon_output->dp_pI2CBus);
+ }
if (MonInfo == NULL) {
if (radeon_output->pI2CBus) {
RADEONI2CDoLock(output, radeon_output->pI2CBus, TRUE);