Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0aa8344 authored by Mahesh Kumar's avatar Mahesh Kumar Committed by Rodrigo Vivi
Browse files

drm/i915/icl: use combophy/TC helper functions during display detection 



Instead of directly comparing HPD pins use intel_port_is_combophy/tc
helper functions to distinguish between combophy/TC ports.

Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181003072203.12848-3-mahesh1.kumar@intel.com
parent 176597a1

drivers/gpu/drm/i915/intel_dp.c

+5 −10
Original line number Diff line number Diff line
@@ -5003,20 +5003,15 @@ static bool icl_digital_port_connected(struct intel_encoder *encoder) 
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);



	switch (encoder->hpd_pin) {

	case HPD_PORT_A:

	case HPD_PORT_B:

	if (intel_port_is_combophy(dev_priv, encoder->port))

		return icl_combo_port_connected(dev_priv, dig_port);

	case HPD_PORT_C:

	case HPD_PORT_D:

	case HPD_PORT_E:

	case HPD_PORT_F:

	else if (intel_port_is_tc(dev_priv, encoder->port))

		return icl_tc_port_connected(dev_priv, dig_port);

	default:

	else

		MISSING_CASE(encoder->hpd_pin);



	return false;

}

}



/*

 * intel_digital_port_connected - is the specified port connected?