Commit 15f080f0 authored by Jani Nikula's avatar Jani Nikula

drm/edid: respect connector force for drm_get_edid ddc probe

Skip DDC probe for forced connector status. Don't try to read the EDID
if the connector is forced off. Skipping probe for forced on connectors
will make more sense when drm_do_get_edid() will handle override and
firmware EDIDs.
Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1487344854-18777-4-git-send-email-jani.nikula@intel.com
parent e9bd0b84
...@@ -1428,7 +1428,10 @@ struct edid *drm_get_edid(struct drm_connector *connector, ...@@ -1428,7 +1428,10 @@ struct edid *drm_get_edid(struct drm_connector *connector,
{ {
struct edid *edid; struct edid *edid;
if (!drm_probe_ddc(adapter)) if (connector->force == DRM_FORCE_OFF)
return NULL;
if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter))
return NULL; return NULL;
edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter); edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment