Commit 0aab2c72 authored Feb 03, 2017 by Lee, Shawn C Committed by Jani Nikula Feb 03, 2017

drm/i915/bxt: Add MST support when do DPLL calculation

Add the missing INTEL_OUTPUT_DP_MST case in bxt_get_dpll()
to correctly initialize the crtc_state and port plls when
link training a DP MST monitor on BXT/APL devices.

Fixes: a277ca7d ("drm/i915: Split bxt_ddi_pll_select()")
Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=99572


Reviewed-by: Cooper Chiou <cooper.chiou@intel.com>
Reviewed-by: Gary C Wang <gary.c.wang@intel.com>
Reviewed-by: Ciobanu, Nathan D <nathan.d.ciobanu@intel.com>
Reviewed-by: Herbert, Marc <marc.herbert@intel.com>
Reviewed-by: Bride, Jim <jim.bride@intel.com>
Reviewed-by: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: <stable@vger.kernel.org> # v4.9+
Signed-off-by: Lee, Shawn C <shawn.c.lee@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486096329-6255-1-git-send-email-shawn.c.lee@intel.com

parent e32e836a

drivers/gpu/drm/i915/intel_dpll_mgr.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1855,7 +1855,8 @@ bxt_get_dpll(struct intel_crtc *crtc,
		return NULL;

		if ((encoder->type == INTEL_OUTPUT_DP \|\|
		encoder->type == INTEL_OUTPUT_EDP) &&
		encoder->type == INTEL_OUTPUT_EDP \|\|
		encoder->type == INTEL_OUTPUT_DP_MST) &&
		!bxt_ddi_dp_set_dpll_hw_state(clock, &dpll_hw_state))
		return NULL;