Skip to content

Commit

Permalink
drm/i915/bios: Introduce has_ddi_port_info()
Browse files Browse the repository at this point in the history
Pull the "do we want to use i915->vbt.ports[]?" check into
a central place.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211217155403.31477-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Ville Syrjälä committed Jan 19, 2022
1 parent 8172375 commit b90b6e4
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/gpu/drm/i915/display/intel_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -2053,6 +2053,11 @@ static void parse_ddi_port(struct drm_i915_private *i915,
i915->vbt.ports[port] = devdata;
}

static bool has_ddi_port_info(struct drm_i915_private *i915)
{
return HAS_DDI(i915);
}

static void parse_ddi_ports(struct drm_i915_private *i915)
{
struct intel_bios_encoder_data *devdata;
Expand Down Expand Up @@ -2653,7 +2658,7 @@ bool intel_bios_is_port_present(struct drm_i915_private *i915, enum port port)
[PORT_F] = { DVO_PORT_DPF, DVO_PORT_HDMIF, },
};

if (HAS_DDI(i915))
if (has_ddi_port_info(i915))
return i915->vbt.ports[port];

/* FIXME maybe deal with port A as well? */
Expand Down Expand Up @@ -2693,7 +2698,7 @@ bool intel_bios_is_port_edp(struct drm_i915_private *i915, enum port port)
[PORT_F] = DVO_PORT_DPF,
};

if (HAS_DDI(i915)) {
if (has_ddi_port_info(i915)) {
const struct intel_bios_encoder_data *devdata;

devdata = intel_bios_encoder_data_lookup(i915, port);
Expand Down Expand Up @@ -2748,7 +2753,7 @@ bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *i915,
};
const struct intel_bios_encoder_data *devdata;

if (HAS_DDI(i915)) {
if (has_ddi_port_info(i915)) {
const struct intel_bios_encoder_data *devdata;

devdata = intel_bios_encoder_data_lookup(i915, port);
Expand Down

0 comments on commit b90b6e4

Please sign in to comment.