drm/i915: Iterate all child devs in intel_bios_is_port_present()

Instead of consulting vbt.ports[] lets just go through the
whole child device list to check whether a specific port
was declared by the VBT or not.

Note that this doesn't change anything wrt. detecting duplicate
child devices with the same port as vbt.ports[] would also always
contain exactly one of the duplicates.

v2: Include a is_port_valid() check to deal with some broken VBTs
    Mention something about duplicate port detection (Jani)

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230214073818.20231-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
pull/795/merge
Ville Syrjälä 2023-02-14 09:38:18 +02:00
parent b5d0bea793
commit b17a15d618
1 changed files with 13 additions and 1 deletions

View File

@ -3399,10 +3399,22 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *i915, u8 *i2c_pin)
*/
bool intel_bios_is_port_present(struct drm_i915_private *i915, enum port port)
{
const struct intel_bios_encoder_data *devdata;
if (WARN_ON(!has_ddi_port_info(i915)))
return true;
return i915->display.vbt.ports[port];
if (!is_port_valid(i915, port))
return false;
list_for_each_entry(devdata, &i915->display.vbt.display_devices, node) {
const struct child_device_config *child = &devdata->child;
if (dvo_port_to_port(i915, child->dvo_port) == port)
return true;
}
return false;
}
/**