Commit c72deaa4 authored by Jani Nikula's avatar Jani Nikula

drm/i915/bios: use port info child pointer to determine HPD invert

Avoid iterating the child devices.

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/841c226efa424701161dd9f1793e0cf96b45a07c.1559308269.git.jani.nikula@intel.com
parent cc21f011
...@@ -2169,49 +2169,22 @@ bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, ...@@ -2169,49 +2169,22 @@ bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv,
/** /**
* intel_bios_is_port_hpd_inverted - is HPD inverted for %port * intel_bios_is_port_hpd_inverted - is HPD inverted for %port
* @dev_priv: i915 device instance * @i915: i915 device instance
* @port: port to check * @port: port to check
* *
* Return true if HPD should be inverted for %port. * Return true if HPD should be inverted for %port.
*/ */
bool bool
intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv, intel_bios_is_port_hpd_inverted(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 (WARN_ON_ONCE(!IS_GEN9_LP(dev_priv))) if (WARN_ON_ONCE(!IS_GEN9_LP(i915)))
return false; return false;
for (i = 0; i < dev_priv->vbt.child_dev_num; i++) { return child && child->hpd_invert;
child = dev_priv->vbt.child_dev + i;
if (!child->hpd_invert)
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;
default:
break;
}
}
return false;
} }
/** /**
......
...@@ -235,7 +235,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por ...@@ -235,7 +235,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port por
bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port); bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port); bool intel_bios_is_port_dp_dual_mode(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_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
bool intel_bios_is_port_hpd_inverted(struct drm_i915_private *dev_priv, 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(struct drm_i915_private *dev_priv,
enum port port); 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