Commit 680c45c7 authored by Matt Atwood's avatar Matt Atwood Committed by José Roberto de Souza
Browse files

drm/i915/dp: Correctly advertise HBR3 for GEN11+ 



intel_dp_set_source_rates() calls intel_dp_is_edp(), which is unsafe to
use before encoder_type is set. This caused GEN11+ to incorrectly strip
HBR3 from source rates for edp. Move intel_dp_set_source_rates() to
after encoder_type is set. Add comment to intel_dp_is_edp() describing
unsafe usages.

v2: Alter intel_dp_set_source_rates final position (Ville/Manasi).
    Remove outdated comment (Ville).
    Slight optimization of control flow in intel_dp_init_connector.
    Slight rewording in commit message.

Signed-off-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200630233310.10191-1-matthew.s.atwood@intel.com
parent fd7a9d8f

drivers/gpu/drm/i915/display/intel_dp.c

+11 −17
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4}; 
 *

 * If a CPU or PCH DP output is attached to an eDP panel, this function

 * will return true, and false otherwise.

 *

 * This function is not safe to use prior to encoder type being set.

 */

bool intel_dp_is_edp(struct intel_dp *intel_dp)

{
@@ -8157,8 +8159,6 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		     intel_encoder->base.name))

		return false;



	intel_dp_set_source_rates(intel_dp);



	intel_dp->reset_link_params = true;

	intel_dp->pps_pipe = INVALID_PIPE;

	intel_dp->active_pipe = INVALID_PIPE;
@@ -8174,27 +8174,21 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		 */

		drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy));

		type = DRM_MODE_CONNECTOR_eDP;

	} else {

		type = DRM_MODE_CONNECTOR_DisplayPort;

	}



	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		intel_dp->active_pipe = vlv_active_pipe(intel_dp);



	/*

	 * For eDP we always set the encoder type to INTEL_OUTPUT_EDP, but

	 * for DP the encoder type can be set by the caller to

	 * INTEL_OUTPUT_UNKNOWN for DDI, so don't rewrite it.

	 */

	if (type == DRM_MODE_CONNECTOR_eDP)

		intel_encoder->type = INTEL_OUTPUT_EDP;



		/* eDP only on port B and/or C on vlv/chv */

		if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) ||

				      IS_CHERRYVIEW(dev_priv)) &&

			intel_dp_is_edp(intel_dp) &&

				port != PORT_B && port != PORT_C))

			return false;

	} else {

		type = DRM_MODE_CONNECTOR_DisplayPort;

	}



	intel_dp_set_source_rates(intel_dp);



	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))

		intel_dp->active_pipe = vlv_active_pipe(intel_dp);



	drm_dbg_kms(&dev_priv->drm,

		    "Adding %s connector on [ENCODER:%d:%s]\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE