diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-01-06 20:58:13 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-01-06 21:14:35 +0100 |
commit | 9d9938854efcf2f21381b930bc1324e95640e0c4 (patch) | |
tree | 7b136c25af5fcc64258f3427f985c1dc667ae0bd /drivers/gpu/drm/i915/intel_hdmi.c | |
parent | ca9ea7a5ffda53ce9e9f3e14b9b104d85db47c7d (diff) | |
parent | 3f37b26f8d57756b591383a9d8ce1cd628bc773c (diff) | |
download | op-kernel-dev-9d9938854efcf2f21381b930bc1324e95640e0c4.zip op-kernel-dev-9d9938854efcf2f21381b930bc1324e95640e0c4.tar.gz |
Merge branch 'for-linus' into for-next
Conflicts:
drivers/gpu/drm/i915/intel_display.c
sound/soc/intel/skylake/skl.h
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-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 c046017..f16cd2a 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -1388,17 +1388,18 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); struct drm_i915_private *dev_priv = to_i915(connector->dev); bool live_status = false; - unsigned int retry = 3; + unsigned int try; DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, connector->name); intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS); - while (!live_status && --retry) { + for (try = 0; !live_status && try < 9; try++) { + if (try) + msleep(10); live_status = intel_digital_port_connected(dev_priv, hdmi_to_dig_port(intel_hdmi)); - mdelay(10); } if (!live_status) |