Commit a98d9c1d authored by Imre Deak's avatar Imre Deak

drm/i915/ddi: Rely on VBT DDI port info for eDP detection

There is at least one APL based system using port A in DP mode
(connecting to an on-board DP->VGA adaptor). Atm we'll configure port A
unconditionally as eDP which is incorrect in this case. Fix this by
relying on the VBT DDI port 'internal port' flag instead on all ports on
DDI platforms. For now chicken out from using VBT for port A before
GEN9.

v2:
- Move the DDI port info lookup to intel_bios_is_port_edp() (David, Jani)
- Use the DDI port info on all DDI platforms starting from port B.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: David Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1482315444-24750-1-git-send-email-imre.deak@intel.com
parent 10810944
...@@ -1669,6 +1669,7 @@ struct ddi_vbt_port_info { ...@@ -1669,6 +1669,7 @@ struct ddi_vbt_port_info {
uint8_t supports_dvi:1; uint8_t supports_dvi:1;
uint8_t supports_hdmi:1; uint8_t supports_hdmi:1;
uint8_t supports_dp:1; uint8_t supports_dp:1;
uint8_t supports_edp:1;
uint8_t alternate_aux_channel; uint8_t alternate_aux_channel;
uint8_t alternate_ddc_pin; uint8_t alternate_ddc_pin;
......
...@@ -1161,6 +1161,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, ...@@ -1161,6 +1161,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
info->supports_dvi = is_dvi; info->supports_dvi = is_dvi;
info->supports_hdmi = is_hdmi; info->supports_hdmi = is_hdmi;
info->supports_dp = is_dp; info->supports_dp = is_dp;
info->supports_edp = is_edp;
DRM_DEBUG_KMS("Port %c VBT info: DP:%d HDMI:%d DVI:%d EDP:%d CRT:%d\n", DRM_DEBUG_KMS("Port %c VBT info: DP:%d HDMI:%d DVI:%d EDP:%d CRT:%d\n",
port_name(port), is_dp, is_hdmi, is_dvi, is_edp, is_crt); port_name(port), is_dp, is_hdmi, is_dvi, is_edp, is_crt);
...@@ -1664,6 +1665,9 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port) ...@@ -1664,6 +1665,9 @@ bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port)
}; };
int i; int i;
if (HAS_DDI(dev_priv))
return dev_priv->vbt.ddi_port_info[port].supports_edp;
if (!dev_priv->vbt.child_dev_num) if (!dev_priv->vbt.child_dev_num)
return false; return false;
......
...@@ -4975,7 +4975,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port) ...@@ -4975,7 +4975,7 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)
if (INTEL_GEN(dev_priv) < 5) if (INTEL_GEN(dev_priv) < 5)
return false; return false;
if (port == PORT_A) if (INTEL_GEN(dev_priv) < 9 && port == PORT_A)
return true; return true;
return intel_bios_is_port_edp(dev_priv, port); return intel_bios_is_port_edp(dev_priv, port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment