[PATCH] drm/i915/dp: Clean up/Get rid of detect_done flag

* [PATCH] drm/i915/dp: Clean up/Get rid of detect_done flag
@ 2017-02-08  0:02 Manasi Navare
  2017-02-08  0:52 ` ✓ Fi.CI.BAT: success for " Patchwork
  0 siblings, 1 reply; 2+ messages in thread
From: Manasi Navare @ 2017-02-08  0:02 UTC (permalink / raw)
  To: intel-gfx

Detect_done flag was added previously when intel_dp_long_pulse
was called from multiple places. However now it is called only
from intel_dp_detect(). So this flag becomes redundant.
Anyway now, we set this to false right away after intel_dp_long_pulse
so it calls long pulse handler always for all calls to .detect()

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
 drivers/gpu/drm/i915/intel_dp.c  | 10 +---------
 drivers/gpu/drm/i915/intel_drv.h |  1 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 21924cf..2a2aaa3 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4667,7 +4667,6 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
 	intel_dp_set_edid(intel_dp);
 	if (is_edp(intel_dp) || intel_connector->detect_edid)
 		status = connector_status_connected;
-	intel_dp->detect_done = true;
 
 	/* Try to read the source of the interrupt */
 	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 &&
@@ -4701,11 +4700,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
-	/* If full detect is not performed yet, do a full detect */
-	if (!intel_dp->detect_done)
-		status = intel_dp_long_pulse(intel_dp->attached_connector);
-
-	intel_dp->detect_done = false;
+	status = intel_dp_long_pulse(intel_dp->attached_connector);
 
 	return status;
 }
@@ -5079,7 +5074,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 		      long_hpd ? "long" : "short");
 
 	if (long_hpd) {
-		intel_dp->detect_done = false;
 		return IRQ_NONE;
 	}
 
@@ -5097,14 +5091,12 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)
 			intel_dp->is_mst = false;
 			drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,
 							intel_dp->is_mst);
-			intel_dp->detect_done = false;
 			goto put_power;
 		}
 	}
 
 	if (!intel_dp->is_mst) {
 		if (!intel_dp_short_pulse(intel_dp)) {
-			intel_dp->detect_done = false;
 			goto put_power;
 		}
 	}
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index fbe5c72..ec264e5 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -921,7 +921,6 @@ struct intel_dp {
 	uint8_t sink_count;
 	bool link_mst;
 	bool has_audio;
-	bool detect_done;
 	bool channel_eq_status;
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 2+ messages in thread