Commit ceccad59 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Only complain about n_edp_entries with eDP ports

commit 10afa0b6 ("drm/i915: Reject >9 ddi translation entried if port != A/E on SKL")
added sanity checks to make sure we don't end up with too many ddi translation
values for eDP ports, but it actually failed to check if the port is eDP.
We still look up the edp translations for non-eDP ports, but don't use
them, so we shouldn't be complaining about them either.

Fixes: 10afa0b6 ("drm/i915: Reject >9 ddi translation entried if port != A/E on SKL")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452612496-9201-1-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9d611c03
...@@ -436,8 +436,9 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder) ...@@ -436,8 +436,9 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
dev_priv->vbt.ddi_port_info[port].dp_boost_level) dev_priv->vbt.ddi_port_info[port].dp_boost_level)
iboost_bit = 1<<31; iboost_bit = 1<<31;
if (WARN_ON(port != PORT_A && if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&
port != PORT_E && n_edp_entries > 9)) port != PORT_A && port != PORT_E &&
n_edp_entries > 9))
n_edp_entries = 9; n_edp_entries = 9;
} else if (IS_BROADWELL(dev_priv)) { } else if (IS_BROADWELL(dev_priv)) {
ddi_translations_fdi = bdw_ddi_translations_fdi; ddi_translations_fdi = bdw_ddi_translations_fdi;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment