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

Commit 0a91877c authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/i915: Move down skl/kbl ddi iboost and n_edp_entires fixup 



No functional change.
Only moving this fixup block out of ddi_translation definitions
so we can split skl and kbl cleanly.

v2: Remove useless comment. (Ville)

Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1475258757-29540-1-git-send-email-rodrigo.vivi@intel.com
parent 41842d6b

drivers/gpu/drm/i915/intel_ddi.c

+11 −9
Original line number Diff line number Diff line
@@ -436,15 +436,6 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder) 
				skl_get_buf_trans_dp(dev_priv, &n_dp_entries);

		ddi_translations_edp =

				skl_get_buf_trans_edp(dev_priv, &n_edp_entries);



		/* If we're boosting the current, set bit 31 of trans1 */

		if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)

			iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;



		if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&

			    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;
@@ -464,6 +455,17 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder) 
		n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);

	}



	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {

		/* If we're boosting the current, set bit 31 of trans1 */

		if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)

			iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;



		if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&

			    port != PORT_A && port != PORT_E &&

			    n_edp_entries > 9))

			n_edp_entries = 9;

	}



	switch (encoder->type) {

	case INTEL_OUTPUT_EDP:

		ddi_translations = ddi_translations_edp;