Rev 6084 | Rev 6935 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 6084 | Rev 6660 | ||
|---|---|---|---|
| Line 1386... | Line 1386... | ||
| 1386 | msleep(10); |
1386 | msleep(10); |
| 1387 | live_status = intel_digital_port_connected(dev_priv, |
1387 | live_status = intel_digital_port_connected(dev_priv, |
| 1388 | hdmi_to_dig_port(intel_hdmi)); |
1388 | hdmi_to_dig_port(intel_hdmi)); |
| 1389 | } |
1389 | } |
| Line 1390... | Line 1390... | ||
| 1390 | 1390 | ||
| 1391 | if (!live_status) |
1391 | if (!live_status) { |
| - | 1392 | DRM_DEBUG_KMS("HDMI live status down\n"); |
|
| - | 1393 | /* |
|
| - | 1394 | * Live status register is not reliable on all intel platforms. |
|
| - | 1395 | * So consider live_status only for certain platforms, for |
|
| - | 1396 | * others, read EDID to determine presence of sink. |
|
| - | 1397 | */ |
|
| - | 1398 | if (INTEL_INFO(dev_priv)->gen < 7 || IS_IVYBRIDGE(dev_priv)) |
|
| - | 1399 | live_status = true; |
|
| Line 1392... | Line 1400... | ||
| 1392 | DRM_DEBUG_KMS("Live status not up!"); |
1400 | } |
| Line 1393... | Line 1401... | ||
| 1393 | 1401 | ||
| 1394 | intel_hdmi_unset_edid(connector); |
1402 | intel_hdmi_unset_edid(connector); |
| Line 2020... | Line 2028... | ||
| 2020 | struct drm_device *dev = intel_encoder->base.dev; |
2028 | struct drm_device *dev = intel_encoder->base.dev; |
| 2021 | struct drm_i915_private *dev_priv = dev->dev_private; |
2029 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 2022 | enum port port = intel_dig_port->port; |
2030 | enum port port = intel_dig_port->port; |
| 2023 | uint8_t alternate_ddc_pin; |
2031 | uint8_t alternate_ddc_pin; |
| Line -... | Line 2032... | ||
| - | 2032 | ||
| - | 2033 | DRM_DEBUG_KMS("Adding HDMI connector on port %c\n", |
|
| - | 2034 | port_name(port)); |
|
| 2024 | 2035 | ||
| 2025 | drm_connector_init(dev, connector, &intel_hdmi_connector_funcs, |
2036 | drm_connector_init(dev, connector, &intel_hdmi_connector_funcs, |
| 2026 | DRM_MODE_CONNECTOR_HDMIA); |
2037 | DRM_MODE_CONNECTOR_HDMIA); |
| Line 2027... | Line 2038... | ||
| 2027 | drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); |
2038 | drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); |