[PATCH 6/6] actually probe displayid in i915

[Jani Nikula]

---
 drivers/gpu/drm/drm_edid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 47da941d8700..4d6d8b14792d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2763,7 +2763,8 @@ const struct drm_edid *drm_edid_read_ddc(struct drm_connector *connector,
 	if (connector->force == DRM_FORCE_OFF)
 		return NULL;
 
-	if (connector->force == DRM_FORCE_UNSPECIFIED && !drm_probe_ddc(adapter))
+	if (connector->force == DRM_FORCE_UNSPECIFIED &&
+	    !drm_probe_displayid(adapter) && !drm_probe_ddc(adapter))
 		return NULL;
 
 	drm_edid = drm_edid_read_custom(connector, ddc_read_block, &context);
-- 
2.39.2