Commit 32c67a2c authored by Lee, Shawn C's avatar Lee, Shawn C Committed by Greg Kroah-Hartman

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

commit 789ea125 upstream.

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=99572Reviewed-by: default avatarCooper Chiou <cooper.chiou@intel.com>
Reviewed-by: default avatarGary C Wang <gary.c.wang@intel.com>
Reviewed-by: default avatarCiobanu, Nathan D <nathan.d.ciobanu@intel.com>
Reviewed-by: default avatarHerbert, Marc <marc.herbert@intel.com>
Reviewed-by: default avatarBride, Jim <jim.bride@intel.com>
Reviewed-by: default avatarNavare, Manasi D <manasi.d.navare@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarLee, Shawn C <shawn.c.lee@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486096329-6255-1-git-send-email-shawn.c.lee@intel.com
(cherry picked from commit 0aab2c72)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ebe976ac
......@@ -1723,7 +1723,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment