[v2,9/9] drm/i915: Enable upfront link training support for HSW/BDW

Commit Message

Navare, Manasi Aug. 23, 2016, 1:41 a.m. UTC

Get the PLLs for HSW/BDW using the platform specific function
and add hooks for enabling upfront link training on HSW and BDW.

v2:
* Change the macro to use dev_priv instead of dev (David Weinehall)

Reviewed-by: Durgadoss R <[e-mail]>
Signed-off-by: Manasi Navare <[e-mail]>
---
 drivers/gpu/drm/i915/intel_ddi.c | 2 ++
 drivers/gpu/drm/i915/intel_dp.c  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index ef63b4b..1d3ab8a 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -2410,6 +2410,8 @@  intel_ddi_get_link_dpll(struct intel_dp *intel_dp, int clock)
 		}
 	} else if (IS_SKYLAKE(dev_priv)) {
 		pll = skl_find_link_pll(dev_priv, clock);
+	} else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) {
+		pll = hsw_ddi_dp_get_dpll(encoder, clock);
 	}
 	return pll;
 }
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e7a67ed..a309754 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -5757,7 +5757,8 @@  intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 
 	/* Initialize upfront link training vfunc for DP */
 	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
-		if (IS_BROXTON(dev_priv) || IS_SKYLAKE(dev_priv))
+		if (IS_BROXTON(dev_priv) || IS_SKYLAKE(dev_priv) ||
+		    IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv))
 			intel_dp->upfront_link_train = intel_ddi_upfront_link_train;
 	}