diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a4d8031..6c3af05 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1641,7 +1641,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
 
 	/* We should parse the EDID data and find out if it has an audio sink
 	 */
-
+#if 0
 	ret = intel_ddc_get_modes(connector, &intel_dp->adapter);
 	if (ret) {
 		if (is_edp(intel_dp) && !dev_priv->panel_fixed_mode) {
@@ -1658,7 +1658,7 @@ static int intel_dp_get_modes(struct drm_connector *connector)
 
 		return ret;
 	}
-
+#endif
 	/* if eDP has no EDID, try to use fixed panel mode from VBT */
 	if (is_edp(intel_dp)) {
 		if (dev_priv->panel_fixed_mode != NULL) {
@@ -1891,6 +1891,9 @@ intel_dp_init(struct drm_device *dev, int output_reg)
 		intel_encoder->type = INTEL_OUTPUT_DISPLAYPORT;
 	}
 
+	if (!is_edp(intel_dp))
+		return;
+
 	connector = &intel_connector->base;
 	drm_connector_init(dev, connector, &intel_dp_connector_funcs, type);
 	drm_connector_helper_add(connector, &intel_dp_connector_helper_funcs);