niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
The initial CI results did not include a TGL system which includes a
panel that is having issues with patch. Revert while we triage.

This reverts commit 680c45c767.

Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200702230957.30536-1-matthew.s.atwood@intel.com
This commit is contained in:
Matt Atwood 2020-07-02 16:09:57 -07:00 • committed by José Roberto de Souza
parent 12b07256c2
commit d391301960
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/gpu/drm/i915/display/intel_dp.c
View file

@ -137,8 +137,6 @@ static const u8 valid_dsc_slicecount[] = {1, 2, 4};
* *
* If a CPU or PCH DP output is attached to an eDP panel, this function * If a CPU or PCH DP output is attached to an eDP panel, this function
* will return true, and false otherwise. * 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) bool intel_dp_is_edp(struct intel_dp *intel_dp)
{ {
@ -8159,6 +8157,8 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
intel_encoder->base.name)) intel_encoder->base.name))
return false; return false;
intel_dp_set_source_rates(intel_dp);
intel_dp->reset_link_params = true; intel_dp->reset_link_params = true;
intel_dp->pps_pipe = INVALID_PIPE; intel_dp->pps_pipe = INVALID_PIPE;
intel_dp->active_pipe = INVALID_PIPE; intel_dp->active_pipe = INVALID_PIPE;
@ -8174,21 +8174,27 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
*/ */
drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy)); drm_WARN_ON(dev, intel_phy_is_tc(dev_priv, phy));
type = DRM_MODE_CONNECTOR_eDP; 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; intel_encoder->type = INTEL_OUTPUT_EDP;
/* eDP only on port B and/or C on vlv/chv */ /* eDP only on port B and/or C on vlv/chv */
if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) || if (drm_WARN_ON(dev, (IS_VALLEYVIEW(dev_priv) ||
IS_CHERRYVIEW(dev_priv)) && IS_CHERRYVIEW(dev_priv)) &&
intel_dp_is_edp(intel_dp) &&
port != PORT_B && port != PORT_C)) port != PORT_B && port != PORT_C))
return false; 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, drm_dbg_kms(&dev_priv->drm,
"Adding %s connector on [ENCODER:%d:%s]\n", "Adding %s connector on [ENCODER:%d:%s]\n",