Commit a7475e5d authored by Jani Nikula's avatar Jani Nikula

drm/i915/bios: use port info child pointer to determine LSPCON presence

Avoid iterating the child devices. This should be a non-functional
change, but theoretically this might enable LSPCON on some extra ports
with buggy VBTs.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4bbaff16abb3461ccb67abf1537f68bb50823390.1559308269.git.jani.nikula@intel.com
parent c72deaa4
...@@ -2189,59 +2189,19 @@ intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915, ...@@ -2189,59 +2189,19 @@ intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915,
/** /**
* intel_bios_is_lspcon_present - if LSPCON is attached on %port * intel_bios_is_lspcon_present - if LSPCON is attached on %port
* @dev_priv: i915 device instance * @i915: i915 device instance
* @port: port to check * @port: port to check
* *
* Return true if LSPCON is present on this port * Return true if LSPCON is present on this port
*/ */
bool bool
intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv, intel_bios_is_lspcon_present(const struct drm_i915_private *i915,
enum port port) enum port port)
{ {
const struct child_device_config *child; const struct child_device_config *child =
int i; i915->vbt.ddi_port_info[port].child;
if (!HAS_LSPCON(dev_priv))
return false;
for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
child = dev_priv->vbt.child_dev + i;
if (!child->lspcon)
continue;
switch (child->dvo_port) {
case DVO_PORT_DPA:
case DVO_PORT_HDMIA:
if (port == PORT_A)
return true;
break;
case DVO_PORT_DPB:
case DVO_PORT_HDMIB:
if (port == PORT_B)
return true;
break;
case DVO_PORT_DPC:
case DVO_PORT_HDMIC:
if (port == PORT_C)
return true;
break;
case DVO_PORT_DPD:
case DVO_PORT_HDMID:
if (port == PORT_D)
return true;
break;
case DVO_PORT_DPF:
case DVO_PORT_HDMIF:
if (port == PORT_F)
return true;
break;
default:
break;
}
}
return false; return HAS_LSPCON(i915) && child && child->lspcon;
} }
enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv,
......
...@@ -237,7 +237,7 @@ bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum por ...@@ -237,7 +237,7 @@ bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum por
bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port); bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
bool intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915, bool intel_bios_is_port_hpd_inverted(const struct drm_i915_private *i915,
enum port port); enum port port);
bool intel_bios_is_lspcon_present(struct drm_i915_private *dev_priv, bool intel_bios_is_lspcon_present(const struct drm_i915_private *i915,
enum port port); enum port port);
enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port port); enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, enum port 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