[PATCH] drm/i915/display: Check if low_vswing is still required in GEN11+

José Roberto de Souza jose.souza at intel.com
Mon Aug 17 20:48:25 UTC 2020


DDI buffer pages of GEN11 and GEN12 don't mention anything about
use DP tables in case this flag is not set.

Signed-off-by: José Roberto de Souza <jose.souza at intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c | 3 +++
 drivers/gpu/drm/i915/display/intel_ddi.c  | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index c53c85d38fa5..2e3348b989de 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -839,6 +839,9 @@ parse_edp(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)
 			vswing = (edp->edp_vswing_preemph >> (panel_type * 4)) & 0xF;
 			dev_priv->vbt.edp.low_vswing = vswing == 0;
 		}
+
+		drm_info(&dev_priv->drm, "params.edp_vswing=%i\n", dev_priv->params.edp_vswing);
+		drm_info(&dev_priv->drm, "vbt.edp.low_vswing=%i\n", dev_priv->vbt.edp.low_vswing);
 	}
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index de5b216561d8..79402bd00ccb 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -1037,15 +1037,13 @@ static const struct cnl_ddi_buf_trans *
 icl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
 			int *n_entries)
 {
-	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-
 	if (type == INTEL_OUTPUT_HDMI) {
 		*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);
 		return icl_combo_phy_ddi_translations_hdmi;
 	} else if (rate > 540000 && type == INTEL_OUTPUT_EDP) {
 		*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);
 		return icl_combo_phy_ddi_translations_edp_hbr3;
-	} else if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) {
+	} else if (type == INTEL_OUTPUT_EDP) {
 		*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2);
 		return icl_combo_phy_ddi_translations_edp_hbr2;
 	}
-- 
2.28.0



More information about the Intel-gfx-trybot mailing list