From: Chris Wilson Date: Wed, 15 Sep 2010 09:42:50 +0000 (+0100) Subject: drm/i915/sdvo: Mark the status as unknown if attached with EDID X-Git-Tag: v2.6.37-rc1~92^2~28^2~114 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f551c84563df2bf144a819993b2d729c66583ee;p=karo-tx-linux.git drm/i915/sdvo: Mark the status as unknown if attached with EDID One problem with devices that share the DDC bus between the VGA and DVI-I connectors is that with two devices attached we cannot know if there is truly a monitor attached to the DVI connector. In this case, it is preferrrable to mark the status as unknown, so that the user can supply the known set of modes and continue to use the output. Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index fbdae4d9220e..d2b4a6a28405 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -1480,7 +1480,7 @@ intel_sdvo_hdmi_sink_detect(struct drm_connector *connector) if (edid == NULL) edid = intel_sdvo_get_analog_edid(connector); - status = connector_status_disconnected; + status = connector_status_unknown; if (edid != NULL) { /* DDC bus is shared, match EDID to connector type */ if (edid->input & DRM_EDID_INPUT_DIGITAL) {