xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_output.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3d158716a60d5a113a541ea2f680b81a1be41ad2
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Jan 14 11:21:33 2010 +1000

    displayport: fix DDC on DVI->DP convertors.
    
    Seems we have to not do auxch DDC if we aren't talking to a DP
    sink.

diff --git a/src/radeon_output.c b/src/radeon_output.c
index a16f7fc..04817e3 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);