From: Alex Deucher Date: Thu, 1 Jul 2010 14:34:56 +0000 (-0400) Subject: drm/radeon/kms: fix shared ddc handling X-Git-Tag: v3.12-rc1~8827^2~101 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2ea4aa67bfd084834edd070e0a4a47857d6db59;p=kernel%2Fkernel-generic.git drm/radeon/kms: fix shared ddc handling Connectors with a shared ddc line can be connected to different encoders. Reported by Pasi Kärkkäinen on dri-devel Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 0c7ccc6..f58f8bd 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -785,7 +785,9 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect if (connector == list_connector) continue; list_radeon_connector = to_radeon_connector(list_connector); - if (radeon_connector->devices == list_radeon_connector->devices) { + if (list_radeon_connector->shared_ddc && + (list_radeon_connector->ddc_bus->rec.i2c_id == + radeon_connector->ddc_bus->rec.i2c_id)) { if (drm_detect_hdmi_monitor(radeon_connector->edid)) { if (connector->connector_type == DRM_MODE_CONNECTOR_DVID) { kfree(radeon_connector->edid);