diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-08 12:59:43 -0500 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-01-12 08:59:59 -0500 |
commit | 10afa0b65fe21cac67e8b19e8b98bde39befc525 (patch) | |
tree | 2770fac70a0f0aa1ad5eee53167498978ce11f16 | |
parent | 78ab0baea270af82a33c142f7f12bca4cdff6728 (diff) |
drm/i915: Reject >9 ddi translation entried if port != A/E on SKL
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@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1449597590-6971-9-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_ddi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index c47146473471..3edb10a4f0b4 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c | |||
@@ -435,6 +435,10 @@ static void intel_prepare_ddi_buffers(struct drm_i915_private *dev_priv, | |||
435 | if (dev_priv->vbt.ddi_port_info[port].hdmi_boost_level || | 435 | if (dev_priv->vbt.ddi_port_info[port].hdmi_boost_level || |
436 | dev_priv->vbt.ddi_port_info[port].dp_boost_level) | 436 | dev_priv->vbt.ddi_port_info[port].dp_boost_level) |
437 | iboost_bit = 1<<31; | 437 | iboost_bit = 1<<31; |
438 | |||
439 | if (WARN_ON(port != PORT_A && | ||
440 | port != PORT_E && n_edp_entries > 9)) | ||
441 | n_edp_entries = 9; | ||
438 | } else if (IS_BROADWELL(dev_priv)) { | 442 | } else if (IS_BROADWELL(dev_priv)) { |
439 | ddi_translations_fdi = bdw_ddi_translations_fdi; | 443 | ddi_translations_fdi = bdw_ddi_translations_fdi; |
440 | ddi_translations_dp = bdw_ddi_translations_dp; | 444 | ddi_translations_dp = bdw_ddi_translations_dp; |
@@ -2084,6 +2088,11 @@ static void skl_ddi_set_iboost(struct drm_i915_private *dev_priv, | |||
2084 | iboost = dp_iboost; | 2088 | iboost = dp_iboost; |
2085 | } else { | 2089 | } else { |
2086 | ddi_translations = skl_get_buf_trans_edp(dev_priv, &n_entries); | 2090 | ddi_translations = skl_get_buf_trans_edp(dev_priv, &n_entries); |
2091 | |||
2092 | if (WARN_ON(port != PORT_A && | ||
2093 | port != PORT_E && n_entries > 9)) | ||
2094 | n_entries = 9; | ||
2095 | |||
2087 | iboost = ddi_translations[level].i_boost; | 2096 | iboost = ddi_translations[level].i_boost; |
2088 | } | 2097 | } |
2089 | } else if (type == INTEL_OUTPUT_HDMI) { | 2098 | } else if (type == INTEL_OUTPUT_HDMI) { |