summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_display.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-11-27 13:01:46 -0500
committerDave Airlie <airlied@redhat.com>2009-12-08 10:22:48 +1000
commit9fa05c98d69eb77c82e59b5e434ca63bba230ba0 (patch)
tree05c1cf57b3fc1456d82d5f65e90a512780ecabc8 /drivers/gpu/drm/radeon/radeon_display.c
parente8696330e2a95e1b5872550dcf3ed04aecaf96b3 (diff)
downloadlinux-stable-9fa05c98d69eb77c82e59b5e434ca63bba230ba0.tar.gz
linux-stable-9fa05c98d69eb77c82e59b5e434ca63bba230ba0.tar.bz2
linux-stable-9fa05c98d69eb77c82e59b5e434ca63bba230ba0.zip
drm/radeon/kms: fix DP detect
only return connected if there is actually a monitor connected. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_display.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_display.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index a1c2804b694d..62c929e5b089 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -339,10 +339,8 @@ int radeon_ddc_get_modes(struct radeon_connector *radeon_connector)
if (radeon_connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
struct radeon_connector_atom_dig *dig = radeon_connector->con_priv;
- if (dig->dp_i2c_bus) {
- radeon_connector->edid = drm_get_edid(&radeon_connector->base, &dig->dp_i2c_bus->adapter);
- DRM_INFO("got edid %p from DP\n", radeon_connector->edid);
- }
+ if (dig->dp_i2c_bus)
+ radeon_connector->edid = drm_get_edid(&radeon_connector->base, &dig->dp_i2c_bus->adapter);
}
if (!radeon_connector->ddc_bus)
return -1;