Skip to content

Commit

Permalink
drm/edid: respect connector force for drm_get_edid ddc probe
Browse files Browse the repository at this point in the history
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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1487344854-18777-4-git-send-email-jani.nikula@intel.com
  • Loading branch information
Jani Nikula committed Feb 21, 2017
1 parent e9bd0b8 commit 15f080f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/gpu/drm/drm_edid.c
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,10 @@ struct edid *drm_get_edid(struct drm_connector *connector,
{
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;

edid = drm_do_get_edid(connector, drm_do_probe_ddc_edid, adapter);
Expand Down

0 comments on commit 15f080f

Please sign in to comment.