Skip to contentSkip to conversation

drm/i915: Correct max delay for HDMI hotplug live status checking

PATCH Superseded Gary Wang 2 participants 2 messages Dec 11, 2015

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Gary Wang

author
#0 lore raw

PATCH 1/1 drm/i915: Correct max delay for HDMI hotplug live status checking

The total delay of HDMI hotplug detecting with 30ms should have been split into a resolution of 3 retries of 10ms each, for the worst cases. But it still suffered from only waiting 10ms at most in intel_hdmi_detect(). This patch corrects it by reading hotplug status with 4 times at most for 30ms delay.

---
 drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_hdmi.c +4 -2
old mode 100644
new mode 100755
index be7fab9..ba042cf
@@ -1394,11 +1394,13 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	while (!live_status && --retry) {
+	do {
 		live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		if (live_status || !retry)
+			break;
 		mdelay(10);
-	}
+	} while (retry--);
 
 	if (!live_status)
 		DRM_DEBUG_KMS("Live status not up!");
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 25 lines · Gary Wang

The total delay of HDMI hotplug detecting with 30ms should have been split into a resolution of 3 retries of 10ms each, for the worst cases. But it still suffered from only waiting 10ms at most in intel_hdmi_detect(). This patch corrects it by reading hotplug status with 4 times at most for 30ms delay.

---
 drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
old mode 100644
new mode 100755
index be7fab9..ba042cf
@@ -1394,11 +1394,13 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1403

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -2
 
-	while (!live_status && --retry) {
+	do {
 		live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		if (live_status || !retry)
+			break;
 		mdelay(10);
-	}
+	} while (retry--);

I agree with Ville, let's just go with an obviously correct for loop here. This is apparently too hard ;-)
-Daniel

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	if (!live_status)
 		DRM_DEBUG_KMS("Live status not up!");
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx