diff options
| author | Jani Nikula <[email protected]> | 2020-02-05 10:29:59 +0200 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2020-02-10 13:09:04 +0200 |
| commit | 2749596220173638e6e73763b2559c7a0b27b2ea (patch) | |
| tree | 6f3546bb282f963a66e70a857bba7663cac441c4 /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | 06f7a61c9b515e5f3a3793e6b4dec93d27b462fc (diff) | |
drm/i915/mst: fix pipe and vblank enable
Commit 21fd23ac222f ("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: 21fd23ac222f ("drm/i915: move pipe, pch and vblank enable to encoders on DDI platforms")
Cc: Vandita Kulkarni <[email protected]>
Cc: Ville Syrjala <[email protected]>
Reported-by: Stanislav Lisovskiy <[email protected]>
Reviewed-by: Vandita Kulkarni <[email protected]>
Reviewed-by: Stanislav Lisovskiy <[email protected]>
Tested-by: Stanislav Lisovskiy <[email protected]>
Signed-off-by: Jani Nikula <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index b8aee506d595..9cd59141953d 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, |