[PATCH] drm/i915: Do not call drm_probe_ddc() when connector force isn't specified

Harish Chegondi harish.chegondi at intel.com
Sat Jun 1 02:06:34 UTC 2019


This would allow the EDID override to be handled correctly in
drm_do_get_edid() for cases where EDID data is missing or corrupt.
drm_probe_ddc() calls drm_do_probe_ddc_edid() which is passed
as an argument and called from drm_do_get_edid().

Signed-off-by: Harish Chegondi <harish.chegondi at intel.com>
---
 drivers/gpu/drm/drm_edid.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d87f574feeca..41c420706532 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1724,9 +1724,6 @@ struct edid *drm_get_edid(struct drm_connector *connector,
 	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);
 	if (edid)
 		drm_get_displayid(connector, edid);
-- 
2.21.0



More information about the Intel-gfx-trybot mailing list