From: Jani Nikula Date: Wed, 5 Feb 2020 08:29:59 +0000 (+0200) Subject: drm/i915/mst: fix pipe and vblank enable X-Git-Tag: baikal/mips/sdk5.9~13997^2~18^2~115 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=a590093f2477bbc57a3a8bc0607fbfbc2fc997f2;p=kernel.git drm/i915/mst: fix pipe and vblank enable Commit 83a124d73500 ("drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms") pushed pipe and vblank enable to encoders on DDI platforms, however it missed the DP MST encoder. Fix it. Fixes: 83a124d73500 ("drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms") Cc: Vandita Kulkarni Cc: Ville Syrjala Reported-by: Stanislav Lisovskiy Reviewed-by: Vandita Kulkarni Reviewed-by: Stanislav Lisovskiy Tested-by: Stanislav Lisovskiy Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20200205082959.31317-1-jani.nikula@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index b8aee506d595c..9cd59141953d8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -491,6 +491,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, struct intel_dp *intel_dp = &intel_dig_port->dp; struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + drm_WARN_ON(&dev_priv->drm, pipe_config->has_pch_encoder); + + intel_enable_pipe(pipe_config); + + intel_crtc_vblank_on(pipe_config); + DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,