[Intel-gfx] [PATCH 08/15] drm/i915: Reject >9 ddi translation entried if port != A/E on SKL
ville.syrjala at linux.intel.com
ville.syrjala at linux.intel.com
Tue Dec 8 09:59:43 PST 2015
From: Ville Syrjälä <ville.syrjala at linux.intel.com>
Only DDI A and E support 10 translation entries in DP mode. For the
other ports the tenth entry is reserved for HDMI..
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
drivers/gpu/drm/i915/intel_ddi.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 838cbbe33517..152c813cc43e 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -443,6 +443,10 @@ static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv,
if (dev_priv->vbt.ddi_port_info[port].hdmi_boost_level ||
dev_priv->vbt.ddi_port_info[port].dp_boost_level)
iboost_bit = 1<<31;
+
+ if (WARN_ON(port != PORT_A &&
+ port != PORT_E && n_edp_entries > 9))
+ n_edp_entries = 9;
} else if (IS_BROADWELL(dev_priv)) {
BUILD_BUG_ON(ARRAY_SIZE(bdw_ddi_translations_fdi) != 9);
BUILD_BUG_ON(ARRAY_SIZE(bdw_ddi_translations_dp) != 9);
@@ -2099,6 +2103,11 @@ static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
iboost = dp_iboost;
} else {
ddi_translations = skl_get_buf_trans_edp(dev_priv, &n_entries);
+
+ if (WARN_ON(port != PORT_A &&
+ port != PORT_E && n_entries > 9))
+ n_entries = 9;
+
iboost = ddi_translations[level].i_boost;
}
} else if (type == INTEL_OUTPUT_HDMI) {
--
2.4.10
More information about the Intel-gfx
mailing list