diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-05-07 17:41:25 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2020-05-11 15:52:52 +0300 |
| commit | 90c49a09c8495f1eac05b42a3f79fdc6bcb1eef0 (patch) | |
| tree | c39fc66e0f445dc8444e1125e10c70dd963cac3a /drivers/gpu/drm/i915/display/intel_dp_mst.c | |
| parent | a80d73673bc7676d0bab7f7ab51d00c5e461992d (diff) | |
| download | linux-90c49a09c8495f1eac05b42a3f79fdc6bcb1eef0.tar.gz linux-90c49a09c8495f1eac05b42a3f79fdc6bcb1eef0.tar.bz2 linux-90c49a09c8495f1eac05b42a3f79fdc6bcb1eef0.zip | |
drm/i915/mst: Wait for ACT sent before enabling the pipe
The correct sequence according to bspec is to wait for the ACT sent
status before we turn on the pipe. Make it so.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200507144125.2458-1-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp_mst.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 74559379384a..8c732418a33f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -512,10 +512,6 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, intel_ddi_enable_transcoder_func(encoder, pipe_config); - intel_enable_pipe(pipe_config); - - intel_crtc_vblank_on(pipe_config); - drm_dbg_kms(&dev_priv->drm, "active links %d\n", intel_dp->active_mst_links); @@ -526,6 +522,11 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state, drm_dp_check_act_status(&intel_dp->mst_mgr); drm_dp_update_payload_part2(&intel_dp->mst_mgr); + + intel_enable_pipe(pipe_config); + + intel_crtc_vblank_on(pipe_config); + if (pipe_config->has_audio) intel_audio_codec_enable(encoder, pipe_config, conn_state); } |