37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 557b452536c9390105539a264d342d963d71b087 Mon Sep 17 00:00:00 2001
|
|
From: Alex Deucher <alexdeucher@gmail.com>
|
|
Date: Mon, 21 Jun 2010 12:07:52 -0400
|
|
Subject: [PATCH] drm/radeon/kms: fix shared ddc handling
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Connectors with a shared ddc line can be connected to different
|
|
encoders.
|
|
|
|
Reported by Pasi Kärkkäinen <pasik@iki.fi> on dri-devel
|
|
|
|
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
|
|
---
|
|
drivers/gpu/drm/radeon/radeon_connectors.c | 4 +++-
|
|
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
|
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);
|
|
--
|
|
1.7.0.1
|
|
|