aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2016-09-30 14:05:56 -0400
committerRodrigo Vivi <rodrigo.vivi@intel.com>2016-10-20 17:50:15 -0400
commit0a91877cf2ee78a2a57d65b42f14eefc54dc4455 (patch)
treeb6d8962607d27161c0813e4947c1f0c83fa6751b
parent41842d6bab75833df398f6764cfb680f38c19ed8 (diff)
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: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1475258757-29540-1-git-send-email-rodrigo.vivi@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 7f7741c1406d..e74c2fc360f1 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -436,15 +436,6 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)
436 skl_get_buf_trans_dp(dev_priv, &n_dp_entries); 436 skl_get_buf_trans_dp(dev_priv, &n_dp_entries);
437 ddi_translations_edp = 437 ddi_translations_edp =
438 skl_get_buf_trans_edp(dev_priv, &n_edp_entries); 438 skl_get_buf_trans_edp(dev_priv, &n_edp_entries);
439
440 /* If we're boosting the current, set bit 31 of trans1 */
441 if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
442 iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
443
444 if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&
445 port != PORT_A && port != PORT_E &&
446 n_edp_entries > 9))
447 n_edp_entries = 9;
448 } else if (IS_BROADWELL(dev_priv)) { 439 } else if (IS_BROADWELL(dev_priv)) {
449 ddi_translations_fdi = bdw_ddi_translations_fdi; 440 ddi_translations_fdi = bdw_ddi_translations_fdi;
450 ddi_translations_dp = bdw_ddi_translations_dp; 441 ddi_translations_dp = bdw_ddi_translations_dp;
@@ -464,6 +455,17 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder)
464 n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp); 455 n_dp_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
465 } 456 }
466 457
458 if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
459 /* If we're boosting the current, set bit 31 of trans1 */
460 if (dev_priv->vbt.ddi_port_info[port].dp_boost_level)
461 iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
462
463 if (WARN_ON(encoder->type == INTEL_OUTPUT_EDP &&
464 port != PORT_A && port != PORT_E &&
465 n_edp_entries > 9))
466 n_edp_entries = 9;
467 }
468
467 switch (encoder->type) { 469 switch (encoder->type) {
468 case INTEL_OUTPUT_EDP: 470 case INTEL_OUTPUT_EDP:
469 ddi_translations = ddi_translations_edp; 471 ddi_translations = ddi_translations_edp;