On Tue, 14 Feb 2023, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > 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 <[email protected]> > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c > b/drivers/gpu/drm/i915/display/intel_bios.c > index efe33af2259b..77964618664a 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -3398,10 +3398,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; > } > > /** -- Jani Nikula, Intel Open Source Graphics Center
