[PATCH 4/4] Revert "debug"

[José Roberto de Souza]

This reverts commit 9e65b92a72fec8e49cf8a3d9a05168caec7d5dfe.
---
 drivers/gpu/drm/i915/intel_ddi.c     |  2 +-
 drivers/gpu/drm/i915/intel_dp.c      |  3 +--
 drivers/gpu/drm/i915/intel_hotplug.c | 12 ++++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 652be8577802..2865ef25e530 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -4298,7 +4298,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 
 	/* In theory we don't need the encoder->type check, but leave it just in
 	 * case we have some really bad VBTs... */
-	if (intel_encoder->type != INTEL_OUTPUT_EDP && init_hdmi && 0) {
+	if (intel_encoder->type != INTEL_OUTPUT_EDP && init_hdmi) {
 		if (!intel_ddi_init_hdmi_connector(intel_dig_port))
 			goto err;
 	}
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index afc9ea7f2341..a0e35a9a2a5e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5404,8 +5404,7 @@ intel_dp_detect(struct drm_connector *connector,
 	/* Can't disconnect eDP */
 	if (intel_dp_is_edp(intel_dp))
 		status = edp_detect(intel_dp);
-	else if (1)
-	//else if (intel_digital_port_connected(encoder))
+	else if (intel_digital_port_connected(encoder))
 		status = intel_dp_detect_dpcd(intel_dp);
 	else
 		status = connector_status_disconnected;
diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c
index d34873671c66..1c26737e6478 100644
--- a/drivers/gpu/drm/i915/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/intel_hotplug.c
@@ -387,15 +387,13 @@ static void i915_hotplug_work_func(struct work_struct *work)
 			continue;
 		intel_encoder = intel_connector->encoder;
 		hpd_bit = BIT(intel_encoder->hpd_pin);
-		if ((hpd_event_bits | retry) & hpd_bit) {
-			ktime_t begin, end;
-			enum intel_hotplug_state ret;
+		if ((hpd_event_bits | hpd_retry_bits) & hpd_bit) {
 			DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
 				      connector->name, intel_encoder->hpd_pin);
 
-			begin = ktime_get();
-			ret = intel_encoder->hotplug(intel_encoder, intel_connector, hpd_event_bits & hpd_bit);
-			switch (ret) {
+			switch (intel_encoder->hotplug(intel_encoder,
+						       intel_connector,
+						       hpd_event_bits & hpd_bit)) {
 			case INTEL_HOTPLUG_NOCHANGE:
 				break;
 			case INTEL_HOTPLUG_CHANGED:
@@ -406,8 +404,6 @@ static void i915_hotplug_work_func(struct work_struct *work)
 				retry |= hpd_bit;
 				break;
 			}
-			end = ktime_get();
-			DRM_DEBUG_KMS("\thotplug() took=%lli nsec(%lli msec) ret=%i\n", end - begin, (end - begin) / NSEC_PER_MSEC, ret);
 		}
 	}
 	drm_connector_list_iter_end(&conn_iter);
-- 
2.21.0