openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alex Deucher 2010-02-19 02:13:56 -05:00 committed by Dave Airlie
parent c86a903836
commit d3932d6c47
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/radeon/radeon_connectors.c
View File

@ -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 * connected and the DVI port disconnected. If the edid doesn't
* say HDMI, vice versa. * 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_device *dev = connector->dev;
struct drm_connector *list_connector; struct drm_connector *list_connector;
struct radeon_connector *list_radeon_connector; struct radeon_connector *list_radeon_connector;
@ -1060,8 +1060,7 @@ radeon_add_atom_connector(struct drm_device *dev,
return; return;
} }
if (radeon_connector->ddc_bus && i2c_bus->valid) { if (radeon_connector->ddc_bus && i2c_bus->valid) {
if (memcmp(&radeon_connector->ddc_bus->rec, i2c_bus, if (radeon_connector->ddc_bus->rec.i2c_id == i2c_bus->i2c_id) {
sizeof(struct radeon_i2c_bus_rec)) == 0) {
radeon_connector->shared_ddc = true; radeon_connector->shared_ddc = true;
shared_ddc = true; shared_ddc = true;
} }