Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10afa0b6 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

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: default avatarVille 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 78ab0bae

drivers/gpu/drm/i915/intel_ddi.c

+9 −0
Original line number Diff line number Diff line
@@ -435,6 +435,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)) {

		ddi_translations_fdi = bdw_ddi_translations_fdi;

		ddi_translations_dp = bdw_ddi_translations_dp;
@@ -2084,6 +2088,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) {