diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2010-02-19 02:13:56 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-20 07:28:06 +1000 |
| commit | d3932d6c475f8307ac66b4ce21563285ec05f6ea (patch) | |
| tree | e513fb749e1ccb9cf2018ad05c500f3cf5e9f250 | |
| parent | c86a90383638fa830c32cf086a1520be72167086 (diff) | |
| download | blackbird-obmc-linux-d3932d6c475f8307ac66b4ce21563285ec05f6ea.tar.gz blackbird-obmc-linux-d3932d6c475f8307ac66b4ce21563285ec05f6ea.zip | |
drm/radeon/kms: fix shared ddc detection
Just compare the i2c id since the i2c structs
may be slighly different.
Fixes fdo bug 26616.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 238188540017..65f81942f399 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -780,7 +780,7 @@ static enum drm_connector_status radeon_dvi_detect(struct drm_connector *connect * connected and the DVI port disconnected. If the edid doesn't * say HDMI, vice versa. */ - if (radeon_connector->shared_ddc && connector_status_connected) { + if (radeon_connector->shared_ddc && (ret == connector_status_connected)) { struct drm_device *dev = connector->dev; struct drm_connector *list_connector; struct radeon_connector *list_radeon_connector; @@ -1060,8 +1060,7 @@ radeon_add_atom_connector(struct drm_device *dev, return; } if (radeon_connector->ddc_bus && i2c_bus->valid) { - if (memcmp(&radeon_connector->ddc_bus->rec, i2c_bus, - sizeof(struct radeon_i2c_bus_rec)) == 0) { + if (radeon_connector->ddc_bus->rec.i2c_id == i2c_bus->i2c_id) { radeon_connector->shared_ddc = true; shared_ddc = true; } |
