| Message ID | 1484126436-10802-1-git-send-email-shawn.c.lee@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 11 Jan 2017, "Lee, Shawn C" <shawn.c.lee@intel.com> wrote: > From: "Lee, Shawn C" <shawn.c.lee@intel.com> > > Kernel oops was trigger by DP MST monitor/hub connected. Copy paste the oops to the commit message please. It's *much* easier to match bug reports and fixes this way. There's likely a bug report, or several bug reports about this over at FDO bugzilla. Any Bugzilla: references we should add? When was this broken? Which commit does this fix? We should use a Fixes: tag to identify it, so the fix can be backported to appropriate stable kernels. BR, Jani. > DP MST series patch already upstream and MST should > be support also. MST monitor will display normally with this > change on bxt platform. > > Cc: Jani Nikula <jani.nikula@intel.com> > 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: Sripada, Radhakrishna <radhakrishna.sripada@intel.com> > > Signed-off-by: Shawn Lee <shawn.c.lee@intel.com> > --- > drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c > index c92a2558beb4..1a1d99d266ed 100644 > --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c > +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c > @@ -1855,7 +1855,8 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, > 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;
diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c index c92a2558beb4..1a1d99d266ed 100644 --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c @@ -1855,7 +1855,8 @@ bool bxt_ddi_dp_set_dpll_hw_state(int clock, 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;