diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 12393df461e4..64086f2d4e26 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -1374,17 +1374,18 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) | |||
1374 | struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); | 1374 | struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); |
1375 | struct drm_i915_private *dev_priv = to_i915(connector->dev); | 1375 | struct drm_i915_private *dev_priv = to_i915(connector->dev); |
1376 | bool live_status = false; | 1376 | bool live_status = false; |
1377 | unsigned int retry = 3; | 1377 | unsigned int try; |
1378 | 1378 | ||
1379 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", | 1379 | DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", |
1380 | connector->base.id, connector->name); | 1380 | connector->base.id, connector->name); |
1381 | 1381 | ||
1382 | intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS); | 1382 | intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS); |
1383 | 1383 | ||
1384 | while (!live_status && --retry) { | 1384 | for (try = 0; !live_status && try < 4; try++) { |
1385 | if (try) | ||
1386 | msleep(10); | ||
1385 | live_status = intel_digital_port_connected(dev_priv, | 1387 | live_status = intel_digital_port_connected(dev_priv, |
1386 | hdmi_to_dig_port(intel_hdmi)); | 1388 | hdmi_to_dig_port(intel_hdmi)); |
1387 | msleep(10); | ||
1388 | } | 1389 | } |
1389 | 1390 | ||
1390 | if (!live_status) | 1391 | if (!live_status) |